diff --git a/charts/showroom/templates/namespace.yaml b/charts/showroom/templates/namespace.yaml
index 01f2311..3e05b8b 100644
--- a/charts/showroom/templates/namespace.yaml
+++ b/charts/showroom/templates/namespace.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.namespace.create -}}
+{{- if eq .Values.namespace.create "true" -}}
 apiVersion: v1
 kind: Namespace
 metadata:
diff --git a/charts/showroom/templates/terminal/deployment.yaml b/charts/showroom/templates/terminal/deployment.yaml
index 14ef699..e62e119 100644
--- a/charts/showroom/templates/terminal/deployment.yaml
+++ b/charts/showroom/templates/terminal/deployment.yaml
@@ -22,7 +22,7 @@ spec:
         args:
           - --base={{ .Values.terminal.wetty.base }}
           - --port={{ .Values.terminal.wetty.port }}
-{{- if .Values.terminal.autoSshToBastion -}}
+{{- if eq .Values.terminal.wetty.autoSshToBastion "true" }}
           - --ssh-host={{ .Values.terminal.wetty.sshHost }}
           - --ssh-port={{ .Values.terminal.wetty.sshPort }}
           - --ssh-user={{ .Values.terminal.wetty.sshUser }}
diff --git a/charts/showroom/values.yaml b/charts/showroom/values.yaml
index 8fa88a2..aca01de 100644
--- a/charts/showroom/values.yaml
+++ b/charts/showroom/values.yaml
@@ -7,7 +7,7 @@
 # when launched as showroom-deployer user, chart CANNOT create namespaces
 
 namespace:
-  create: true
+  create: "true"
   name: showroom
 
 guid: nnnn
@@ -64,7 +64,7 @@ terminal:
   # image: ghcr.io/rhpds/showroom-terminal:latest # for when we return to custom built
   name: terminal
   wetty:
-    autoSshToBastion: false
+    autoSshToBastion: "false"
     base: '/wetty/'
     port: 8080
     sshHost: shared-410-bastion.openshift.redhatworkshops.io