diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml
index 3b7ae8d03f..e505ce2b69 100644
--- a/playbooks/openshift-apps/greenwave.yml
+++ b/playbooks/openshift-apps/greenwave.yml
@@ -42,11 +42,36 @@
     key: fedmsg-greenwave.crt
     privatefile: fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.fedoraproject.org.crt
     when: env != "staging"
-  - { role: openshift/object, vars: {app: greenwave, template: imagestream.yml, objectname: imagestream.yml }}
-  - { role: openshift/object, vars: {app: greenwave, template: buildconfig.yml, objectname: buildconfig.yml}, when : env != 'staging' }
-  - { role: openshift/start-build, vars: {app: greenwave, buildname: greenwave-docker-build, objectname: greenwave-docker-build}, when: env != 'staging' }
-  - { role: openshift/object, vars: {app: greenwave, template: configmap.yml, objectname: configmap.yml }}
-  - { role: openshift/object, vars: {app: greenwave, file: service.yml, objectname: service.yml }}
-  - { role: openshift/object, vars: {app: greenwave, file: route.yml, objectname: route.yml }}
-  - { role: openshift/object, vars: {app: greenwave, file: deploymentconfig.yml, objectname: deploymentconfig.yml }}
-  - { role: openshift/rollout, vars: {app: greenwave, dcname: greenwave-web }}
+  - role: openshift/object
+    app: greenwave
+    template: imagestream.yml
+    objectname: imagestream.yml
+  - role: openshift/object
+    app: greenwave
+    template: buildconfig.yml
+    objectname: buildconfig.yml
+    when : env != 'staging'
+  - role: openshift/start-build
+    app: greenwave
+    buildname: greenwave-docker-build
+    objectname: greenwave-docker-build
+    when: env != 'staging'
+  - role: openshift/object
+    app: greenwave
+    template: configmap.yml
+    objectname: configmap.yml
+  - role: openshift/object
+    app: greenwave
+    file: service.yml
+    objectname: service.yml
+  - role: openshift/object
+    app: greenwave
+    file: route.yml
+    objectname: route.yml
+  - role: openshift/object
+    app: greenwave
+    file: deploymentconfig.yml
+    objectname: deploymentconfig.yml
+  - role: openshift/rollout
+    app: greenwave
+    dcname: greenwave-web