diff --git a/roles/pagure/templates/pagure.cfg b/roles/pagure/templates/pagure.cfg
index fd0e663f3d..8b8a78940e 100644
--- a/roles/pagure/templates/pagure.cfg
+++ b/roles/pagure/templates/pagure.cfg
@@ -25,14 +25,14 @@ EMAIL_ERROR = 'pingou@pingoured.fr'
 SMTP_SERVER = 'localhost'
 
 ### Email used to sent emails
-{% if env == 'staging' %}
+{% if env == 'pagure-staging' %}
 FROM_EMAIL = 'pagure@stg.pagure.io'
 {% else %}
 FROM_EMAIL = 'pagure@pagure.io'
 {% endif %}
 
 ### The URL at which the project is available.
-{% if env == 'staging' %}
+{% if env == 'pagure-staging' %}
 APP_URL = 'https://stg.pagure.io/'
 {% else %}
 APP_URL = 'https://pagure.io/'
diff --git a/roles/pagure/templates/pagure_admin.cfg b/roles/pagure/templates/pagure_admin.cfg
index 82505e86a0..9fb77f6437 100644
--- a/roles/pagure/templates/pagure_admin.cfg
+++ b/roles/pagure/templates/pagure_admin.cfg
@@ -25,14 +25,14 @@ EMAIL_ERROR = 'pingou@pingoured.fr'
 SMTP_SERVER = 'localhost'
 
 ### Email used to sent emails
-{% if env == 'staging' %}
-APP_URL = 'https://dev.pagure.io/'
+{% if env == 'pagure-staging' %}
+FROM_EMAIL = 'pagure@stg.pagure.io'
 {% else %}
-FROM_EMAIL = 'pagure@dev.pagure.io'
+FROM_EMAIL = 'pagure@pagure.io'
 {% endif %}
 
 ### The URL at which the project is available.
-{% if env == 'staging' %}
+{% if env == 'pagure-staging' %}
 APP_URL = 'https://dev.pagure.io/'
 {% else %}
 APP_URL = 'https://pagure.io/'