diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml
index d566850746..1bda5bda2f 100644
--- a/playbooks/openshift-apps/bodhi.yml
+++ b/playbooks/openshift-apps/bodhi.yml
@@ -17,7 +17,7 @@
   - { role: openshift/object, vars: {app: bodhi, file: imagestream.yml }}
   - { role: openshift/object, vars: {app: bodhi, file: buildconfig.yml }}
   - { role: openshift/start-build, vars: {app: bodhi, name: bodhi-web-build }}
-  - { role: openshift/object, vars: {app: bodhi, template: configmap.yml }}
+  #- { role: openshift/object, vars: {app: bodhi, template: configmap.yml }}
   - { role: openshift/object, vars: {app: bodhi, file: service.yml }}
   - { role: openshift/object, vars: {app: bodhi, file: route.yml }}
   - { role: openshift/object, vars: {app: bodhi, file: deploymentconfig.yml }}
diff --git a/roles/openshift/object/defaults/main.yml b/roles/openshift/object/defaults/main.yml
deleted file mode 100644
index e56a9ed7bd..0000000000
--- a/roles/openshift/object/defaults/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-template: ""
-template_fullpath: ""
-file: ""
diff --git a/roles/openshift/object/tasks/main.yml b/roles/openshift/object/tasks/main.yml
index 06c4f90f9e..9e2cbe0597 100644
--- a/roles/openshift/object/tasks/main.yml
+++ b/roles/openshift/object/tasks/main.yml
@@ -5,17 +5,17 @@
 
 - name: Copy template {{template}} to temporary file ({{tmpfile.path}})
   template: src={{roles_path}}/openshift-apps/{{app}}/templates/{{template}} dest={{tmpfile.path}}
-  when: template != ''
+  when: template is defined
   run_once: true
 
 - name: Copy template {{template_fullpath}} to temporary file ({{tmpfile.path}})
   template: src={{template_fullpath}} dest={{tmpfile.path}}
-  when: template_fullpath != ''
+  when: template_fullpath is defined and template is not defined
   run_once: true
 
 - name: Copy file {{file}} to temporary file ({{tmpfile.path}})
   copy: src={{roles_path}}/openshift-apps/{{app}}/files/{{file}} dest={{tmpfile.path}}
-  when: file != ''
+  when: file is defined and template is not defined and template_fullpath is not defined
   run_once: true
 
 - name: Call `oc apply` on the copied file