diff --git a/roles/ocp4_workload_showroom/defaults/main.yaml b/roles/ocp4_workload_showroom/defaults/main.yaml
index 64d68d3..e719605 100644
--- a/roles/ocp4_workload_showroom/defaults/main.yaml
+++ b/roles/ocp4_workload_showroom/defaults/main.yaml
@@ -18,13 +18,15 @@ ocp4_workload_showroom_content_git_repo_ref: main
 # Which Antora Playbook to use in the content repo
 ocp4_workload_showroom_content_antora_playbook: site.yml
 
-# Which terminal to deploy:
-# - wetty: deploy the wetty terminal image. You can then set
-#          ocp4_workload_showroom_wetty_ssh_bastion_login to true
-#          to automatically ssh to a bastion
-# - showroom: deploy the showroom terminal image
+# Which terminal(s) to deploy:
+# - ocp-terminal: deploy the ocp-terminal image (ttyd sandbox with oc CLI)
+# - wetty: deploy the wetty terminal image (SSH to bastion).
+#          Set ocp4_workload_showroom_wetty_ssh_bastion_login to true
+#          to automatically ssh to a bastion.
+# - both: deploy both ocp-terminal and wetty
+# - showroom: (deprecated alias for ocp-terminal, kept for backward compatibility)
 # - "": No terminal deployed
-ocp4_workload_showroom_terminal_type: showroom
+ocp4_workload_showroom_terminal_type: ocp-terminal
 
 # Requests and limits for the terminal pod (same vars for either showroom or wetty)
 ocp4_workload_showroom_terminal_requests_cpu: 50m
@@ -58,7 +60,7 @@ ocp4_workload_showroom_antora_enable_dev_mode: false
 # - quay.io/rhpds/openshift-showroom-terminal-ocp:latest
 # - quay.io/rhpds/openshift-showroom-terminal-rosa:latest
 # - quay.io/rhpds/openshift-showroom-terminal-aro:latest
-ocp4_workload_showroom_terminal_image: quay.io/rhpds/openshift-showroom-terminal-ocp:latest
+ocp4_workload_showroom_terminal_image: quay.io/rhpds/openshift-showroom-terminal-ocp:4.20
 
 # Wetty Image
 ocp4_workload_showroom_wetty_image: quay.io/rhpds/wetty:v3.2.1
diff --git a/roles/ocp4_workload_showroom/tasks/deploy_showroom.yaml b/roles/ocp4_workload_showroom/tasks/deploy_showroom.yaml
index 9c07c9e..3bb8374 100644
--- a/roles/ocp4_workload_showroom/tasks/deploy_showroom.yaml
+++ b/roles/ocp4_workload_showroom/tasks/deploy_showroom.yaml
@@ -52,7 +52,7 @@
              | default(showroom_openshift_apps_domain, true)
              | default('', true) }}
       terminal:
-        setup: "{{ (true if ocp4_workload_showroom_terminal_type == 'showroom' else false) | bool | string | lower }}"
+        setup: "{{ (ocp4_workload_showroom_terminal_type in ['showroom', 'ocp-terminal', 'both']) | string | lower }}"
         image: "{{ ocp4_workload_showroom_terminal_image }}"
         resources:
           requests:
@@ -66,7 +66,7 @@
           pvcSize: "{{ ocp4_workload_showroom_terminal_storage_pvc_size }}"
           storageClass: "{{ ocp4_workload_showroom_terminal_storage_class }}"
       wetty:
-        setup: "{{ (true if ocp4_workload_showroom_terminal_type == 'wetty' else false) | bool | string | lower }}"
+        setup: "{{ (ocp4_workload_showroom_terminal_type in ['wetty', 'both']) | string | lower }}"
         image: "{{ ocp4_workload_showroom_wetty_image }}"
         resources:
           requests: