diff --git a/.github/workflows/training-e2e.yaml b/.github/workflows/training-e2e.yaml
index 97e28656..69f9f9c2 100644
--- a/.github/workflows/training-e2e.yaml
+++ b/.github/workflows/training-e2e.yaml
@@ -96,20 +96,13 @@ jobs:
 
       - name: Wait for 4 minutes
         run: sleep 240
-
-      # - name: Setup tmate session
-      #   uses: mxschmitt/action-tmate@v3.18
-      #   timeout-minutes: 20
-      #   with:
-      #     detached: true
-      #     limit-access-to-actor: false
       
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3.18
         timeout-minutes: 60
         with:
-          detached: true
-          limit-access-to-actor: false
+          detached: false
+          limit-access-to-actor: true
 
       - name: Run tests
         run: |
@@ -124,13 +117,13 @@ jobs:
           ANSIBLE_CONFIG: ./main/training/tests/ansible.cfg
 
       # This should exist in the final workflow
-      - name: Setup tmate session
-        if: ${{ failure() }}
-        uses: mxschmitt/action-tmate@v3.18
-        timeout-minutes: 15
-        with:
-          detached: true
-          limit-access-to-actor: false
+      # - name: Setup tmate session
+      #   if: ${{ failure() }}
+      #   uses: mxschmitt/action-tmate@v3.18
+      #   timeout-minutes: 15
+      #   with:
+      #     detached: true
+      #     limit-access-to-actor: false
 
       - name: Destroy Test Environment
         id: down
diff --git a/training/tests/e2e-tests/playbook.yml b/training/tests/e2e-tests/playbook.yml
index dd07b765..a729fdef 100644
--- a/training/tests/e2e-tests/playbook.yml
+++ b/training/tests/e2e-tests/playbook.yml
@@ -21,19 +21,26 @@
       dest: /tmp/basic-workflow-tests.sh
       mode: 755
 
+  - name: Login to subman
+    ignore_errors: yes
+    community.general.redhat_subscription module:
+      auto_attach: true
+      password: "{{ subman_pass }}"
+      username: "{{ subman_user }}"
+
   # Allow for debugging with tmate
-  # - name: Wait for 15 minutes
-  #   pause:
-  #     minutes: 15
+  - name: Wait for 30 minutes
+    pause:
+      minutes: 30
 
   - name: Run tests
-    ansible.builtin.shell: /tmp/basic-workflow-tests.sh
+    ansible.builtin.shell: /tmp/basic-workflow-tests.sh -cm
     register: out
 
-  - name: Test Results - stdout
-    debug:
-      msg: "{{out.stdout_lines}}"
+  # - name: Test Results - stdout
+  #   debug:
+  #     msg: "{{out.stdout_lines}}"
 
-  - name: Test Results - stderr
-    debug:
-      msg: "{{out.stderr_lines}}"
+  # - name: Test Results - stderr
+  #   debug:
+  #     msg: "{{out.stderr_lines}}"