diff --git a/roles/pem_deploy/tasks/02_create_namespace_secrets.yml b/roles/pem_deploy/tasks/02_create_namespace_secrets.yml
index bc6eeb9..aca5209 100644
--- a/roles/pem_deploy/tasks/02_create_namespace_secrets.yml
+++ b/roles/pem_deploy/tasks/02_create_namespace_secrets.yml
@@ -114,10 +114,10 @@
         SERVER_KEYSTORE_PASSWORD: "{{ pem_keystore_password }}"
         SMTP_PASSWORD:
         SSP_PASSWORD: "{{ pem_default_password }}"
-        STERLING_B2BAPI_PASSWORD: "{{ pem_b2bi_pw }}"
-        STERLING_CONNECTVITYAPI_PASSWORD: "{{ pem_b2bi_apipw }}"
-        STERLING_SFGAPI_PASSWORD: "{{ pem_b2bi_apipw }}"
-        STERLING_SYSTEM_PASSPHRASE: "{{ pem_b2bi_passphrase }}"
+        STERLING_B2BAPI_PASSWORD: "{{ pem_deploy_b2bi_prod_pw }}"
+        STERLING_CONNECTVITYAPI_PASSWORD: "{{ pem_deploy_b2bi_prod_apipw }}"
+        STERLING_SFGAPI_PASSWORD: "{{ pem_deploy_b2bi_prod_apipw }}"
+        STERLING_SYSTEM_PASSPHRASE: "{{ pem_deploy_b2bi_prod_passphrase }}"
         OAUTH2_CMKS:
 
 - name: "Generate secret '{{ pem_deploy_cm_nonprod_secret }}'"
@@ -146,8 +146,8 @@
         SERVER_KEYSTORE_PASSWORD: "{{ pem_keystore_password }}"
         SMTP_PASSWORD:
         SSP_PASSWORD: "{{ pem_default_password }}"
-        STERLING_B2BAPI_PASSWORD: "{{ pem_b2bi_pw }}"
-        STERLING_CONNECTVITYAPI_PASSWORD: "{{ pem_b2bi_apipw }}"
-        STERLING_SFGAPI_PASSWORD: "{{ pem_b2bi_apipw }}"
-        STERLING_SYSTEM_PASSPHRASE: "{{ pem_b2bi_passphrase }}"
+        STERLING_B2BAPI_PASSWORD: "{{ pem_deploy_b2bi_nonprod_pw }}"
+        STERLING_CONNECTVITYAPI_PASSWORD: "{{ pem_deploy_b2bi_nonprod_apipw }}"
+        STERLING_SFGAPI_PASSWORD: "{{ pem_deploy_b2bi_nonprod_apipw }}"
+        STERLING_SYSTEM_PASSPHRASE: "{{ pem_deploy_b2bi_nonprod_passphrase }}"
         OAUTH2_CMKS: