diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml
index 861a85fb43..63d8c63f01 100644
--- a/playbooks/groups/docker-registry.yml
+++ b/playbooks/groups/docker-registry.yml
@@ -58,12 +58,13 @@
             },
           filesystem: {
             rootdirectory: "/srv/"
+          }
         },
         httpd: {
           addr: "localhost:5000"
-        }
+        },
+        when: env == "staging"
       }
-      when: env == "staging"
     - {
       role: docker-distribution,
         conf_path: "/etc/docker-distribution/registry/config.yml",
@@ -81,10 +82,11 @@
             },
           filesystem: {
             rootdirectory: "/srv/"
+          }
         },
         httpd: {
           addr: "localhost:5000"
-        }
+        },
+        when: env == "production"
       }
-      when: env == "production"