diff --git a/roles/badges/backend/templates/alembic.ini b/roles/badges/backend/templates/alembic.ini
index 3ef6c8dd78..6a151a1cf0 100644
--- a/roles/badges/backend/templates/alembic.ini
+++ b/roles/badges/backend/templates/alembic.ini
@@ -14,8 +14,11 @@ script_location = /usr/share/tahrir_api/alembic/
 # set to 'true' to run the environment during
 # the 'revision' command, regardless of autogenerate
 # revision_environment = false
-
+{% if env == 'staging' %}
+sqlalchemy.url = postgresql://{{tahrirDBUser}}:{{tahrirstgDBPassword}}@db-tahrir/tahrir
+{% else %}
 sqlalchemy.url = postgresql://{{tahrirDBUser}}:{{tahrirDBPassword}}@db-tahrir/tahrir
+{% endif %}
 
 # Logging configuration
 [loggers]
diff --git a/roles/badges/backend/templates/badges-awarder.py b/roles/badges/backend/templates/badges-awarder.py
index ee33929554..5b39b5caa0 100644
--- a/roles/badges/backend/templates/badges-awarder.py
+++ b/roles/badges/backend/templates/badges-awarder.py
@@ -14,7 +14,7 @@ config = {
 
         # This is a sqlalchemy URI that points to the tahrir DB.
         {% if env == 'staging' %}
-        "database_uri": "postgresql://{{tahrirDBUser}}:{{tahrirDBPassword}}@db01.stg.iad2.fedoraproject.org/tahrir",
+        "database_uri": "postgresql://{{tahrirDBUser}}:{{tahrirstgDBPassword}}@db01.stg.iad2.fedoraproject.org/tahrir",
         {% else %}
         "database_uri": "postgresql://{{tahrirDBUser}}:{{tahrirDBPassword}}@db-tahrir/tahrir",
         {% endif %}
diff --git a/roles/badges/frontend/templates/tahrir.ini b/roles/badges/frontend/templates/tahrir.ini
index 8dfcfdf4b9..de98eab396 100644
--- a/roles/badges/frontend/templates/tahrir.ini
+++ b/roles/badges/frontend/templates/tahrir.ini
@@ -28,7 +28,7 @@ pyramid.includes =
     pyramid_tm
 
 {% if env == 'staging' %}
-sqlalchemy.url = postgresql://{{tahrirDBUser}}:{{tahrirDBPassword}}@db01.stg.iad2.fedoraproject.org/tahrir
+sqlalchemy.url = postgresql://{{tahrirDBUser}}:{{tahrirstgDBPassword}}@db01.stg.iad2.fedoraproject.org/tahrir
 {% else %}
 sqlalchemy.url = postgresql://{{tahrirDBUser}}:{{tahrirDBPassword}}@db-tahrir/tahrir
 {% endif %}
@@ -90,8 +90,13 @@ tahrir.social.twitter_user_hash = #fedora
 tahrir.social.gplus = True
 
 
+{% if env == 'staging' %}
+session.secret="{{tahrirstgSessionSecret}}"
+authnsecret="{{tahrirstgAuthnSecret}}"
+{% else %}
 session.secret="{{tahrirSessionSecret}}"
 authnsecret="{{tahrirAuthnSecret}}"
+{% endif %}
 
 moksha.domain = fedoraproject.org
 
diff --git a/roles/pagure/templates/pagure.cfg b/roles/pagure/templates/pagure.cfg
index ef08911130..971e2d3899 100644
--- a/roles/pagure/templates/pagure.cfg
+++ b/roles/pagure/templates/pagure.cfg
@@ -12,7 +12,7 @@ ADMIN_SESSION_LIFETIME = timedelta(minutes=20)
 WTF_CSRF_TIME_LIMIT=None
 
 ### Secret key for the Flask application
-{% if env == 'staging' %}
+{% if env == 'pagure-staging' %}
 SECRET_KEY='{{ pagure_stg_secret_key }}'
 SALT_EMAIL='{{ pagure_stg_secret_salt_email }}'
 {% else %}
@@ -33,7 +33,7 @@ FAS_OPENID_ENDPOINT = 'https://id.stg.fedoraproject.org/openid/'
 ### url to the database server:
 #DB_URL=mysql://user:pass@host/db_name
 #DB_URL=postgres://user:pass@host/db_name
-{% if env == 'staging' %}
+{% if env == 'pagure-staging' %}
 DB_URL = 'postgresql://{{ pagure_stg_db_user }}:{{ pagure_stg_db_pass }}@{{ pagure_db_host }}/{{ pagure_stg_db_name }}'
 {% else %}
 DB_URL = 'postgresql://{{ pagure_db_user }}:{{ pagure_db_pass }}@{{ pagure_db_host }}/{{ pagure_db_name }}'