diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml
index 3f6a63b328..5d37aecd87 100644
--- a/playbooks/openshift-apps/noggin.yml
+++ b/playbooks/openshift-apps/noggin.yml
@@ -64,6 +64,7 @@
     app: noggin
     template: configmap.yml
     objectname: configmap.yml
+    noggin_theme: fas
 
   - role: openshift/ipa-client
     app: noggin
diff --git a/roles/openshift-apps/noggin/templates/buildconfig.yml b/roles/openshift-apps/noggin/templates/buildconfig.yml
index b87d7ba929..335921efc6 100644
--- a/roles/openshift-apps/noggin/templates/buildconfig.yml
+++ b/roles/openshift-apps/noggin/templates/buildconfig.yml
@@ -3,7 +3,7 @@ kind: BuildConfig
 metadata:
   name: noggin
   labels:
-    app: noggin
+    app: {{ app }}
     build: noggin
 spec:
   runPolicy: Serial
diff --git a/roles/openshift-apps/noggin/templates/configmap.yml b/roles/openshift-apps/noggin/templates/configmap.yml
index 1268d82e27..570d4dbdc3 100644
--- a/roles/openshift-apps/noggin/templates/configmap.yml
+++ b/roles/openshift-apps/noggin/templates/configmap.yml
@@ -9,7 +9,7 @@ items:
   metadata:
     name: noggin-config
     labels:
-      app: noggin
+      app: {{ app }}
   data:
     noggin.cfg: |-
       {{ load_file('noggin.cfg.py') | indent(6) }}
@@ -20,7 +20,7 @@ items:
   metadata:
     name: wsgi-script
     labels:
-      app: noggin
+      app: {{ app }}
   data:
     wsgi.py: |-
       {{ load_file('wsgi.py') | indent(6) }}
@@ -30,7 +30,7 @@ items:
   metadata:
     name: fedora-messaging-config
     labels:
-      app: noggin
+      app: {{ app }}
   data:
     config.toml: |-
       {{ load_file('fedora-messaging.toml') | indent(6) }}
diff --git a/roles/openshift-apps/noggin/templates/deploymentconfig.yml b/roles/openshift-apps/noggin/templates/deploymentconfig.yml
index a1a1a5047f..fbf7d241d6 100644
--- a/roles/openshift-apps/noggin/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/noggin/templates/deploymentconfig.yml
@@ -3,11 +3,11 @@ kind: DeploymentConfig
 metadata:
   name: noggin
   labels:
-    app: noggin
+    app: {{ app }}
 spec:
   replicas: 1
   selector:
-    app: noggin
+    app: {{ app }}
     deploymentconfig: noggin
   strategy:
     type: Rolling
@@ -22,7 +22,7 @@ spec:
     metadata:
       creationTimestamp: null
       labels:
-        app: noggin
+        app: {{ app }}
         deploymentconfig: noggin
     spec:
       containers:
diff --git a/roles/openshift-apps/noggin/templates/noggin.cfg.py b/roles/openshift-apps/noggin/templates/noggin.cfg.py
index bbad6ee88a..ac0f61377b 100644
--- a/roles/openshift-apps/noggin/templates/noggin.cfg.py
+++ b/roles/openshift-apps/noggin/templates/noggin.cfg.py
@@ -31,7 +31,7 @@ MAIL_DEFAULT_SENDER = "Fedora Account System <fas@fedoraproject.org>"
 MAIL_SERVER = "bastion.fedoraproject.org"
 
 # Theme
-THEME = "fas"
+THEME = "{{ noggin_theme }}"
 
 # Those file should be mounted from OpenShift secrets
 FREEIPA_ADMIN_PASSWORD = from_file('/etc/noggin-secrets/ipa-admin')
diff --git a/roles/openshift-apps/noggin/files/service.yml b/roles/openshift-apps/noggin/templates/service.yml
similarity index 82%
rename from roles/openshift-apps/noggin/files/service.yml
rename to roles/openshift-apps/noggin/templates/service.yml
index 970ccb3419..b1955b7f9a 100644
--- a/roles/openshift-apps/noggin/files/service.yml
+++ b/roles/openshift-apps/noggin/templates/service.yml
@@ -3,12 +3,12 @@ kind: Service
 metadata:
   name: noggin-web
   labels:
-    app: noggin
+    app: {{ app }}
 spec:
   ports:
     - name: web
       port: 8080
       targetPort: 8080
   selector:
-    app: noggin
+    app: {{ app }}
     deploymentconfig: noggin