diff --git a/roles/openshift-apps/blockerbugs/templates/cron.yml b/roles/openshift-apps/blockerbugs/templates/cron.yml
index 62318c8a0e..19c714a5d9 100644
--- a/roles/openshift-apps/blockerbugs/templates/cron.yml
+++ b/roles/openshift-apps/blockerbugs/templates/cron.yml
@@ -37,11 +37,23 @@ spec:
               value: "{{ stg_blockerbugs_db_password }}"
             - name: SECRET_KEY
               value: "{{ stg_blockerbugs_secret_key }}"
+            - name: PAGURE_REPO_TOKEN
+              value: "{{ stg_blockerbugs_pagure_repo_token_secret }}"
+            - name: PAGURE_REPO_WEBHOOK_KEY
+              value: "{{ stg_blockerbugs_pagure_repo_webhook_key_secret }}"
+            - name: BUGZILLA_API_KEY
+              value: "{{ stg_blockerbugs_bz_api_key }}"
 {% else %}
             - name: POSTGRESQL_PASSWORD
               value: "{{ prod_blockerbugs_db_password }}"
             - name: SECRET_KEY
               value: "{{ prod_blockerbugs_secret_key }}"
+            - name: PAGURE_REPO_TOKEN
+              value: "{{ prod_blockerbugs_pagure_repo_token_secret }}"
+            - name: PAGURE_REPO_WEBHOOK_KEY
+              value: "{{ prod_blockerbugs_pagure_repo_webhook_key_secret }}"
+            - name: BUGZILLA_API_KEY
+              value: "{{ prod_blockerbugs_bz_api_key }}"
 {% endif %}
             - name: SECRET_KEY
               value: "{{ blockerbugs_secret_key }}"
@@ -69,13 +81,6 @@ spec:
               value: "{{ blockerbugs_pagure_url }}api/0/"
             - name: BUGZILLA_URL
               value: "{{ blockerbugs_bugzilla_url }}"
-{% if env == 'staging' %}
-            - name: BUGZILLA_API_KEY
-              value: "{{ stg_blockerbugs_bz_api_key }}"
-{% else %}
-            - name: BUGZILLA_API_KEY
-              value: "{{ prod_blockerbugs_bz_api_key }}"
-{% endif %}
             - name: BODHI_URL
               value: "https://bodhi{{ env_suffix }}.fedoraproject.org/"
             - name: OPENSHIFT_PROD
diff --git a/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml b/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml
index 833b49c821..48ece63434 100644
--- a/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml
@@ -55,11 +55,23 @@ spec:
           value: "{{ stg_blockerbugs_db_password }}"
         - name: SECRET_KEY
           value: "{{ stg_blockerbugs_secret_key }}"
+        - name: PAGURE_REPO_TOKEN
+          value: "{{ stg_blockerbugs_pagure_repo_token_secret }}"
+        - name: PAGURE_REPO_WEBHOOK_KEY
+          value: "{{ stg_blockerbugs_pagure_repo_webhook_key_secret }}"
+        - name: BUGZILLA_API_KEY
+          value: "{{ stg_blockerbugs_bz_api_key }}"
 {% else %}
         - name: POSTGRESQL_PASSWORD
           value: "{{ prod_blockerbugs_db_password }}"
         - name: SECRET_KEY
           value: "{{ prod_blockerbugs_secret_key }}"
+        - name: PAGURE_REPO_TOKEN
+          value: "{{ prod_blockerbugs_pagure_repo_token_secret }}"
+        - name: PAGURE_REPO_WEBHOOK_KEY
+          value: "{{ prod_blockerbugs_pagure_repo_webhook_key_secret }}"
+        - name: BUGZILLA_API_KEY
+          value: "{{ prod_blockerbugs_bz_api_key }}"
 {% endif %}
         - name: BLOCKERBUGS_URL
           value: "https://qa{{ env_suffix }}.fedoraproject.org/blockerbugs/"
@@ -75,23 +87,12 @@ spec:
           value: "True"
         - name: PAGURE_REPO
           value: "fedora-qa/blocker-review"
-        - name: PAGURE_REPO_TOKEN
-          value: "{{ blockerbugs_pagure_repo_token_secret }}"
-        - name: PAGURE_REPO_WEBHOOK_KEY
-          value: "{{ blockerbugs_pagure_repo_webhook_key_secret }}"
         - name: PAGURE_URL
           value: "{{ blockerbugs_pagure_url }}"
         - name: PAGURE_API
           value: "{{ blockerbugs_pagure_url }}api/0/"
         - name: BUGZILLA_URL
           value: "{{ blockerbugs_bugzilla_url }}"
-{% if env == 'staging' %}
-        - name: BUGZILLA_API_KEY
-          value: "{{ stg_blockerbugs_bz_api_key }}"
-{% else %}
-        - name: BUGZILLA_API_KEY
-          value: "{{ prod_blockerbugs_bz_api_key }}"
-{% endif %}
         - name: BODHI_URL
           value: "https://bodhi{{ env_suffix }}.fedoraproject.org/"
         - name: OPENSHIFT_PROD