diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 215943f..189a832 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,6 +14,15 @@ jobs:
 
       - name: Start Desktop
         uses: ./start
+        timeout-minutes: 5
+
+      - name: Gather Diagnostics
+        if: ${{ always() }}
+        run: /Applications/Docker.app/Contents/MacOS/com.docker.diagnose gather -upload
+
+      - name: Setup tmate session
+        if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3
 
       - name: Debug
         run: |
diff --git a/start/action.yml b/start/action.yml
index 712ddc4..0964921 100644
--- a/start/action.yml
+++ b/start/action.yml
@@ -79,26 +79,23 @@ runs:
         echo "ls ./cache/desktopInstallSettings/"
         ls ./cache/desktopInstallSettings/ || true
 
-    - name: Setup tmate session
-      uses: mxschmitt/action-tmate@v3
+    - name: Start Docker Desktop app
+      shell: bash
+      run: |
+        /usr/bin/open /Applications/Docker.app --args --unattended --add-host-docker-internal-registry --telemetry
+        echo "Docker starting..."
 
-#    - name: Start Docker Desktop app
-#      shell: bash
-#      run: |
-#        /usr/bin/open /Applications/Docker.app --args --unattended --add-host-docker-internal-registry --telemetry
-#        echo "Docker starting..."
-##
-#    - name: Wait for Docker to be up and running
-#      shell: bash
-#      run: |
-#        docker ps || true
-#        sleep 10
-#        docker ps || true
-#        sleep 10
-#        docker ps || true
-#        sleep 10
-#        docker ps || true
-#        sleep 10
+    - name: Wait for Docker to be up and running
+      shell: bash
+      run: |
+        docker ps || true
+        sleep 10
+        docker ps || true
+        sleep 10
+        docker ps || true
+        sleep 10
+        docker ps || true
+        sleep 10
 
 #        until docker ps; do echo "docker not ready, sleep 10 s and try again"; sleep 10; done
 #        echo "Docker started and ready"