diff --git a/master.yml b/master.yml
index a55d95da0f..d855abfdde 100644
--- a/master.yml
+++ b/master.yml
@@ -12,113 +12,113 @@
 #
 # group playbooks
 
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/anitya.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/arm-qa.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-backend.yml  
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-web.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/backup-server.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-backend.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-web.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/basset.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/bastion.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/batcave.yml
-#- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildhw.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildvm.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugyou.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/busgateway.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/certgetter.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/ci.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-backend.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-dist-git.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-keygen.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/datagrepper.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/docker-registry.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/dhcp.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/dns.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/download.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/elections.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/fas.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedimg.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedocal.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/freshmaker.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/github2fedmsg.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/gnome-backups.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/hotness.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/hubs.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/infinote.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/ipa.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/ipsilon.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/kerneltest.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/keyserver.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/koji-hub.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/kojipkgs.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/koschei-backend.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/koschei-web.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/logserver.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/loopabull.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/mbs.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/mailman.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/maintainer-test.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/mariadb-server.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/mdapi.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/mirrormanager.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/memcached.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/modernpaste.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/noc.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/notifs-backend.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/notifs-web.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/nuancier.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/odcs.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/openqa.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/openqa-workers.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/openstack-compute-nodes.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/osbs-cluster.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/os-cluster.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/packages.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/pagure.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/pagure-proxy.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/pdc.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/people.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/pkgdb.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/pkgs.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/postgresql-server.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/postgresql-server-bdr.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/proxies.yml
-#- import_playbook: /srv/web/infra/ansible/playbooks/groups/qa.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/resultsdb-prod.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/resultsdb-dev.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/resultsdb-stg.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/retrace.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/releng-compose.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/secondary.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/smtp-mm.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/sign-bridge.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/simple-koji-ci.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/statscache.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/sundries.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/tagger.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/taskotron.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/taskotron-client-hosts.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/torrent.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/twisted-buildbots.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/unbound.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/value.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/virthost.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/wiki.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/zanata2fedmsg.yml
-
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/anitya.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/arm-qa.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-backend.yml  
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-web.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/backup-server.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-backend.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-web.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/basset.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/bastion.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/batcave.yml
+##- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildhw.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildvm.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugyou.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/busgateway.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/certgetter.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/ci.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-backend.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-dist-git.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-keygen.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/datagrepper.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/docker-registry.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/dhcp.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/dns.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/download.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/elections.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/fas.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedimg.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedocal.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/freshmaker.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/github2fedmsg.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/gnome-backups.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/hotness.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/hubs.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/infinote.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/ipa.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/ipsilon.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/kerneltest.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/keyserver.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/koji-hub.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/kojipkgs.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/koschei-backend.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/koschei-web.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/logserver.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/loopabull.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mbs.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mailman.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/maintainer-test.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mariadb-server.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mdapi.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mirrormanager.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/memcached.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/modernpaste.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/noc.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/notifs-backend.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/notifs-web.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/nuancier.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/odcs.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/openqa.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/openqa-workers.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/openstack-compute-nodes.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/osbs-cluster.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/os-cluster.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/packages.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/pagure.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/pagure-proxy.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/pdc.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/people.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/pkgdb.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/pkgs.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/postgresql-server.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/postgresql-server-bdr.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/proxies.yml
+##- import_playbook: /srv/web/infra/ansible/playbooks/groups/qa.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/resultsdb-prod.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/resultsdb-dev.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/resultsdb-stg.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/retrace.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/releng-compose.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/secondary.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/smtp-mm.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/sign-bridge.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/simple-koji-ci.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/statscache.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/sundries.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/tagger.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/taskotron.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/taskotron-client-hosts.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/torrent.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/twisted-buildbots.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/unbound.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/value.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/virthost.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/wiki.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/zanata2fedmsg.yml
+####
 #
 # Openshift apps
 #
-- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/bodhi.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/greenwave.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/librariesio2fedmsg.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/bodhi.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/greenwave.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/librariesio2fedmsg.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/modernpaste.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/rats.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/release-monitoring.yml
diff --git a/playbooks/openshift-apps/modernpaste.yml b/playbooks/openshift-apps/modernpaste.yml
index d2115f4fe0..3ce14abec1 100644
--- a/playbooks/openshift-apps/modernpaste.yml
+++ b/playbooks/openshift-apps/modernpaste.yml
@@ -14,12 +14,30 @@
     description: modernpaste
     appowners:
     - codeblock
-  - { role: openshift/object, vars: {app: modernpaste, file: imagestream.yml }}
-  - { role: openshift/object, vars: {app: modernpaste, template: secret.yml }}
-  - { role: openshift/object, vars: {app: modernpaste, file: buildconfig.yml }}
-  - { role: openshift/start-build, vars: {app: modernpaste, name: modernpaste-docker-build }}
-  - { role: openshift/object, vars: {app: modernpaste, template: configmap.yml }}
-  - { role: openshift/object, vars: {app: modernpaste, file: service.yml }}
-  - { role: openshift/object, vars: {app: modernpaste, file: route.yml }}
-  - { role: openshift/object, vars: {app: modernpaste, file: deploymentconfig.yml }}
-  - { role: openshift/rollout, vars: {app: modernpaste, name: modernpaste-web }}
+  - role: openshift/object
+    app: modernpaste
+    file: imagestream.yml
+  - role: openshift/object
+    app: modernpaste
+    template: secret.yml
+  - role: openshift/object
+    app: modernpaste
+    file: buildconfig.yml
+  - role: openshift/start-build
+    app: modernpaste
+    buildname: modernpaste-docker-build
+  - role: openshift/object
+    app: modernpaste
+    template: configmap.yml
+  - role: openshift/object
+    app: modernpaste
+    file: service.yml
+  - role: openshift/object
+    app: modernpaste
+    file: route.yml
+  - role: openshift/object
+    app: modernpaste
+    file: deploymentconfig.yml
+  - role: openshift/rollout
+    app: modernpaste
+    dcname: modernpaste-web