diff --git a/files/2fa/pam_url.conf.j2 b/files/2fa/pam_url.conf.j2
index 3265a04ce0..73cb9c6530 100644
--- a/files/2fa/pam_url.conf.j2
+++ b/files/2fa/pam_url.conf.j2
@@ -2,7 +2,7 @@ pam_url:
 {
 	settings:
 	{
-                {% if environment == 'staging' %}
+                {% if env == 'staging' %}
 		url = "https://fas-all.phx2.fedoraproject.org:8443/";	# URI to fetch
                 {% elif datacenter == 'phx2' %}
 		url = "https://fas-all.stg.phx2.fedoraproject.org:8443/";	# URI to fetch
diff --git a/files/fedmsg/base.py.j2 b/files/fedmsg/base.py.j2
index 19ec4ebc07..f90dfb3d1b 100644
--- a/files/fedmsg/base.py.j2
+++ b/files/fedmsg/base.py.j2
@@ -2,14 +2,12 @@
 config = dict(
     # Set this to dev if you're hacking on fedmsg or an app locally.
     # Set to stg or prod if running in the Fedora Infrastructure.
-    {% if environment == 'staging' %}
+    {% if env == 'staging' %}
     environment="stg",
     {% else %}
     environment="prod",
     {% endif %}
 
-    # XXX - the ansible environment var is "${environment}".
-
     # This used to be set to 1 for safety, but it turns out it was
     # excessive.  It is the number of seconds that fedmsg should sleep
     # after it has initialized, but before it begins to try and send any
diff --git a/files/fedmsg/endpoints.py.j2 b/files/fedmsg/endpoints.py.j2
index e51539756e..d9b3db24ae 100644
--- a/files/fedmsg/endpoints.py.j2
+++ b/files/fedmsg/endpoints.py.j2
@@ -1,4 +1,4 @@
-{% if environment == 'staging' %}
+{% if env == 'staging' %}
 suffix  = 'stg.phx2.fedoraproject.org'
 non_phx_suffix = 'stg.fedoraproject.org'
 {% else %}
@@ -28,7 +28,7 @@ config = dict(
             "tcp://releng01.%s:3000" % suffix,
             "tcp://releng01.%s:3001" % suffix,
         ],
-{% if not environment == 'staging' %}
+{% if not env == 'staging' %}
         "bodhi.app03": [
             "tcp://app03.%s:300%i" % (suffix, i)
             for i in range(8)
@@ -68,7 +68,7 @@ config = dict(
             "tcp://fas01.%s:30%02i" % (suffix, i)
             for i in range(32)
         ],
-{% if environment != 'staging' %}
+{% if env != 'staging' %}
         "fas.fas02": [
             "tcp://fas02.%s:30%02i" % (suffix, i)
             for i in range(32)
@@ -83,7 +83,7 @@ config = dict(
             "tcp://packages01.%s:30%02i" % (suffix, i)
             for i in range(32)
         ],
-{% if environment != 'staging' %}
+{% if env != 'staging' %}
         "fedoratagger.packages02": [
             "tcp://packages02.%s:30%02i" % (suffix, i)
             for i in range(32)
@@ -92,7 +92,7 @@ config = dict(
         "busmon_consumers.busgateway01": [
             "tcp://busgateway01.%s:3000" % suffix,
         ],
-{% if environment != 'staging' %}
+{% if env != 'staging' %}
         "supybot.value03": [
             "tcp://value03.%s:3000" % suffix,
         ],
@@ -109,7 +109,7 @@ config = dict(
             for i in range(6)
         ],
 
-{% if environment != 'staging' %}
+{% if env != 'staging' %}
         # fedorahosted trac runs as 4 processes with 4 threads each.
         "trac.hosted03": [
             "tcp://hosted03.%s:30%02i" % (vpn_suffix, i)
diff --git a/files/fedmsg/pkgdb.py.j2 b/files/fedmsg/pkgdb.py.j2
index 8fb624bc07..4b5914b1be 100644
--- a/files/fedmsg/pkgdb.py.j2
+++ b/files/fedmsg/pkgdb.py.j2
@@ -1,4 +1,4 @@
-{% if environment == 'staging' %}
+{% if env == 'staging' %}
 suffix  = 'stg.phx2.fedoraproject.org'
 non_phx_suffix = 'stg.fedoraproject.org'
 {% else %}
@@ -16,7 +16,7 @@ config = dict(
             "tcp://app02.%s:301%i" % (suffix, i)
             for i in range(6)
         ],
-{% if not environment == 'staging' %}
+{% if not env == 'staging' %}
         "pkgdb.app03": [
             "tcp://app03.%s:301%i" % (suffix, i)
             for i in range(6)
diff --git a/files/fedmsg/relay.py.j2 b/files/fedmsg/relay.py.j2
index 5266e77e41..7a4c45808d 100644
--- a/files/fedmsg/relay.py.j2
+++ b/files/fedmsg/relay.py.j2
@@ -1,4 +1,4 @@
-{% if environment == 'staging' %}
+{% if env == 'staging' %}
 suffix  = 'stg.phx2.fedoraproject.org'
 non_phx_suffix = 'stg.fedoraproject.org'
 {% else %}
diff --git a/files/fedmsg/ssl.py.j2 b/files/fedmsg/ssl.py.j2
index 665b1d0666..eaa7c19d89 100644
--- a/files/fedmsg/ssl.py.j2
+++ b/files/fedmsg/ssl.py.j2
@@ -1,5 +1,5 @@
 
-{% if environment == 'staging' %}
+{% if env == 'staging' %}
 suffix = "stg.phx2.fedoraproject.org"
 app_hosts = [
     "app01.stg.phx2.fedoraproject.org",
diff --git a/inventory/group_vars/staging b/inventory/group_vars/staging
index 750292a724..1a6791e044 100644
--- a/inventory/group_vars/staging
+++ b/inventory/group_vars/staging
@@ -1,3 +1,3 @@
 ---
 freezes: false
-environment: staging
+env: staging