diff --git a/.github/workflows/bootstrap.exp b/.github/workflows/bootstrap.exp
index 18a23df88ff..5219b5ac753 100644
--- a/.github/workflows/bootstrap.exp
+++ b/.github/workflows/bootstrap.exp
@@ -1,4 +1,4 @@
-set timeout 120
+set timeout 180
 spawn fprime-bootstrap project
 expect "Project name (MyProject):"
 send -- "MyProject\r"
diff --git a/.github/workflows/component.exp b/.github/workflows/component.exp
index fd5b295cd58..312c29e4ef4 100644
--- a/.github/workflows/component.exp
+++ b/.github/workflows/component.exp
@@ -1,15 +1,11 @@
-set timeout 120
+set timeout 180
 spawn fprime-util new --component
-expect "Component name (MyComponent):"
-send -- "MyComponent\r"
-expect "Select component kind"
-send -- "1\r"
-expect "Enable Commands?"
-send -- "1\r"
-expect "Enable Telemetry?"
-send -- "1\r"
-expect "Enable Parameters?"
-send -- "1\r"
-expect "Add MyComponent to"
-send -- "yes\r"
-expect eof
+expect {
+  "Component name (MyComponent):" {send -- "MyComponent\r" ; exp_continue}
+  "Select component kind" {"1\r" ; exp_continue}
+  "Enable Commands?" {"1\r" ; exp_continue}
+  "Enable Telemetry?" {"1\r" ; exp_continue}
+  "Enable Parameters?" {"1\r" ; exp_continue}
+  "Add MyComponent to" {"yes\r" ; exp_continue}
+  eof
+}
diff --git a/.github/workflows/deployment.exp b/.github/workflows/deployment.exp
index 4cdee06b5cc..72f860aad6d 100644
--- a/.github/workflows/deployment.exp
+++ b/.github/workflows/deployment.exp
@@ -1,4 +1,4 @@
-set timeout 120
+set timeout 180
 spawn fprime-util new --deployment
 expect "Deployment name (MyDeployment):"
 send -- "MyDeployment\r"
diff --git a/.github/workflows/validate_templates.yml b/.github/workflows/validate_templates.yml
index 1ac53871233..3d2c2811ab1 100644
--- a/.github/workflows/validate_templates.yml
+++ b/.github/workflows/validate_templates.yml
@@ -27,13 +27,13 @@ jobs:
              fprime-util generate
              fprime-util build
 
-      - name: "Test Deployment and build"
-        run: |
-             cd test_dev/MyProject
-             . fprime-venv/bin/activate
-             expect ../../.github/workflows/deployment.exp
-             cd MyDeployment
-             fprime-util build
+#      - name: "Test Deployment and build"
+#        run: |
+#             cd test_dev/MyProject
+#             . fprime-venv/bin/activate
+#             expect ../../.github/workflows/deployment.exp
+#             cd MyDeployment
+#             fprime-util build
 
       - name: "Test Component and build"
         run: |