diff --git a/roles/openshift-apps/resultsdb/templates/configmaps.yml b/roles/openshift-apps/resultsdb/templates/configmaps.yml
index eb030e94ea..753fd5dfe6 100644
--- a/roles/openshift-apps/resultsdb/templates/configmaps.yml
+++ b/roles/openshift-apps/resultsdb/templates/configmaps.yml
@@ -25,7 +25,7 @@ data:
         Require valid-user
       </LimitExcept>
     </Location>
-{% if deployment_type not in ['local', 'dev'] %}
+{% if deployment_type is defined and deployment_type not in ['local', 'dev'] %}
 ---
 apiVersion: v1
 kind: ConfigMap
diff --git a/roles/openshift-apps/resultsdb/templates/deploymentconfigs.yml b/roles/openshift-apps/resultsdb/templates/deploymentconfigs.yml
index 58b6f80ec9..c7ebd028ad 100644
--- a/roles/openshift-apps/resultsdb/templates/deploymentconfigs.yml
+++ b/roles/openshift-apps/resultsdb/templates/deploymentconfigs.yml
@@ -58,7 +58,7 @@ spec:
             - name: httpd-config-volume
               mountPath: /etc/httpd/conf.d
               readOnly: true
-{% if deployment_type not in ['local', 'dev']%}
+{% if deployment_type is defined and deployment_type not in ['local', 'dev']%}
             - name: fedora-messaging-ca-volume
               mountPath: /etc/pki/rabbitmq/ca
               readOnly: true
@@ -98,7 +98,7 @@ spec:
         - name: httpd-config-volume
           configMap:
             name: "resultsdb-httpd-config"
-{% if deployment_type not in ['local', 'dev']%}
+{% if deployment_type is defined and deployment_type not in ['local', 'dev']%}
         - name: fedora-messaging-config-volume
           configMap:
             name: fedora-messaging-configmap
diff --git a/roles/openshift-apps/resultsdb/templates/secrets.yml b/roles/openshift-apps/resultsdb/templates/secrets.yml
index dbbf9d1eb6..13be3fc211 100644
--- a/roles/openshift-apps/resultsdb/templates/secrets.yml
+++ b/roles/openshift-apps/resultsdb/templates/secrets.yml
@@ -22,7 +22,7 @@ stringData:
     STREAM_LOGGING = True
     RUN_HOST= '0.0.0.0'
     RUN_PORT = 5001
-{% if deployment_type in ['local', 'dev']%}
+{% if deployment_type is defined and deployment_type in ['local', 'dev']%}
     MESSAGE_BUS_PUBLISH = False
     MESSAGE_BUS_PUBLISH_TASKOTRON = False
 {% else %}
@@ -30,7 +30,7 @@ stringData:
     MESSAGE_BUS_PUBLISH_TASKOTRON = True
 {% endif %}
     MESSAGE_BUS_PLUGIN = 'fedmsg'
-{% if deployment_type in ['local'] %}
+{% if deployment_type is defined and deployment_type in ['local'] %}
     # This is for the Testdays deployment
     MESSAGE_BUS_PLUGIN = 'dummy'
 {% endif %}