diff --git a/playbooks/openshift-apps/noggin-centos.yml b/playbooks/openshift-apps/noggin-centos.yml
index bb8d00e596..12c2a4b752 100644
--- a/playbooks/openshift-apps/noggin-centos.yml
+++ b/playbooks/openshift-apps/noggin-centos.yml
@@ -56,12 +56,14 @@
     imagename: noggin
 
   - role: openshift/object
-    app: noggin-centos
+    app: noggin
+    os_app: noggin-centos
     template: buildconfig.yml
     objectname: buildconfig.yml
 
   - role: openshift/object
-    app: noggin-centos
+    app: noggin
+    os_app: noggin-centos
     template: configmap.yml
     objectname: configmap.yml
     noggin_theme: centos
@@ -70,7 +72,8 @@
     app: noggin-centos
 
   - role: openshift/object
-    app: noggin-centos
+    app: noggin
+    os_app: noggin-centos
     template: service.yml
     objectname: service.yml
 
@@ -84,17 +87,20 @@
       haproxy.router.openshift.io/timeout: 5m
 
   - role: openshift/object
-    app: noggin-centos
+    app: noggin
+    os_app: noggin-centos
     template: secrets.yml
     objectname: secrets.yml
 
   - role: openshift/object
-    app: noggin-centos
+    app: noggin
+    os_app: noggin-centos
     template: secret-webhook.yml
     objectname: secret-webhook.yml
 
   - role: openshift/object
-    app: noggin-centos
+    app: noggin
+    os_app: noggin-centos
     template: deploymentconfig.yml
     objectname: deploymentconfig.yml
 
diff --git a/roles/openshift/object/defaults/main.yml b/roles/openshift/object/defaults/main.yml
new file mode 100644
index 0000000000..bae6245ab2
--- /dev/null
+++ b/roles/openshift/object/defaults/main.yml
@@ -0,0 +1 @@
+os_app: "{{app}}"
diff --git a/roles/openshift/object/tasks/main.yml b/roles/openshift/object/tasks/main.yml
index 61270aeae9..0ed198e306 100644
--- a/roles/openshift/object/tasks/main.yml
+++ b/roles/openshift/object/tasks/main.yml
@@ -1,18 +1,18 @@
 - name: Copy template {{template}} to temporary file ({{tmpfile.path}})
-  template: src={{roles_path}}/openshift-apps/{{app}}/templates/{{template}} dest=/etc/openshift_apps/{{app}}/{{objectname}}
+  template: src={{roles_path}}/openshift-apps/{{app}}/templates/{{template}} dest=/etc/openshift_apps/{{os_app}}/{{objectname}}
   when: template is defined
   register: object_template
 
 - name: Copy template {{template_fullpath}} to temporary file ({{tmpfile.path}})
-  template: src={{template_fullpath}} dest=/etc/openshift_apps/{{app}}/{{objectname}}
+  template: src={{template_fullpath}} dest=/etc/openshift_apps/{{os_app}}/{{objectname}}
   when: template_fullpath is defined and template is not defined
   register: object_template_fullpath
 
 - name: Copy file {{file}} to temporary file ({{tmpfile.path}})
-  copy: src={{roles_path}}/openshift-apps/{{app}}/files/{{file}} dest=/etc/openshift_apps/{{app}}/{{objectname}}
+  copy: src={{roles_path}}/openshift-apps/{{app}}/files/{{file}} dest=/etc/openshift_apps/{{os_app}}/{{objectname}}
   when: file is defined and template is not defined and template_fullpath is not defined
   register: object_file
 
 - name: Call `oc apply` on the copied file
-  shell: oc -n {{app}} apply -f /etc/openshift_apps/{{app}}/{{objectname}}
+  shell: oc -n {{os_app}} apply -f /etc/openshift_apps/{{os_app}}/{{objectname}}
   when: object_template.changed or object_template_fullpath.changed or object_file.changed
diff --git a/roles/openshift/secret-file/defaults/main.yml b/roles/openshift/secret-file/defaults/main.yml
new file mode 100644
index 0000000000..bae6245ab2
--- /dev/null
+++ b/roles/openshift/secret-file/defaults/main.yml
@@ -0,0 +1 @@
+os_app: "{{app}}"
diff --git a/roles/openshift/secret-file/tasks/main.yml b/roles/openshift/secret-file/tasks/main.yml
index db842b3af1..8cf4f66dbb 100644
--- a/roles/openshift/secret-file/tasks/main.yml
+++ b/roles/openshift/secret-file/tasks/main.yml
@@ -1,26 +1,26 @@
 - name: Copy template {{template}}
-  template: src={{roles_path}}/openshift-apps/{{app}}/templates/{{template}} dest=/etc/openshift_apps/{{app}}/{{key}}
+  template: src={{roles_path}}/openshift-apps/{{app}}/templates/{{template}} dest=/etc/openshift_apps/{{os_app}}/{{key}}
   when: template is defined
   register: secret_template
 
 - name: Copy file {{file}}
-  copy: src={{roles_path}}/openshift-apps/{{app}}/files/{{file}} dest=/etc/openshift_apps/{{app}}/{{key}}
+  copy: src={{roles_path}}/openshift-apps/{{app}}/files/{{file}} dest=/etc/openshift_apps/{{os_app}}/{{key}}
   when: file is defined
   register: secret_file
 
 - name: Copy private file {{privatefile}}
-  copy: src={{private}}/files/{{privatefile}} dest=/etc/openshift_apps/{{app}}/{{key}}
+  copy: src={{private}}/files/{{privatefile}} dest=/etc/openshift_apps/{{os_app}}/{{key}}
   when: privatefile is defined
   register: secret_privatefile
 
 - name: Delete existing secrets
-  shell: oc -n {{app}} delete secret/{{secret_name}}
+  shell: oc -n {{os_app}} delete secret/{{secret_name}}
   register: delete_out
   changed_when: "'NotFound' in delete_out.stderr"
   failed_when: "('NotFound' not in delete_out.stderr) and (delete_out.rc != 0)"
   when: secret_template.changed or secret_file.changed or secret_privatefile.changed
 
 - name: Call `oc secrets new` on the copied file
-  shell: oc -n {{app}} secrets new {{secret_name}} {{key}}=/etc/openshift_apps/{{app}}/{{key}}
+  shell: oc -n {{os_app}} secrets new {{secret_name}} {{key}}=/etc/openshift_apps/{{os_app}}/{{key}}
   register: create_out
   when: secret_template.changed or secret_file.changed or secret_privatefile.changed