diff --git a/.github/workflows/bootstrap.exp b/.github/workflows/bootstrap.exp
index 18a23df88ff..a7c6d16cba9 100644
--- a/.github/workflows/bootstrap.exp
+++ b/.github/workflows/bootstrap.exp
@@ -1,5 +1,5 @@
-set timeout 120
+set timeout 180
 spawn fprime-bootstrap project
 expect "Project name (MyProject):"
-send -- "MyProject\r"
+send "MyProject\r"
 expect eof
diff --git a/.github/workflows/component.exp b/.github/workflows/component.exp
index fd5b295cd58..19a30134310 100644
--- a/.github/workflows/component.exp
+++ b/.github/workflows/component.exp
@@ -1,15 +1,24 @@
-set timeout 120
+set timeout 60
 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 -re {.*Component name.*}
+send "MyComponent\r"
+expect -re {.*Component short description.*}
+send "test component\r"
+expect -re {.*Component namespace.*}
+send "Components\r"
+expect -re {.*Select component kind}
+send "1\r"
+expect -re {.*Enable Commands.*}
+send "1\r"
+expect -re {.*Enable Telemetry.*}
+send "1\r"
+expect -re {.*Enable Events.*}
+send "1\r"
+expect -re {.*Enable Parameters.*}
+send "1\r"
+expect -re {Add MyComponent to.*}
+send "yes\r"
+expect -re {Generate implementation files.*}
+send "yes\r"
+expect -re {.*New deployment successfully created.*}
 expect eof
diff --git a/.github/workflows/deployment.exp b/.github/workflows/deployment.exp
index 4cdee06b5cc..265866511d2 100644
--- a/.github/workflows/deployment.exp
+++ b/.github/workflows/deployment.exp
@@ -1,9 +1,9 @@
 set timeout 120
 spawn fprime-util new --deployment
 expect "Deployment name (MyDeployment):"
-send -- "MyDeployment\r"
-expect "Select communication driver type"
-send -- "2\r"
-expect "Add MyDeployment to fprime/CMakeLists.txt"
-send -- "yes\r"
+send "MyDeployment\r"
+expect -re "* Select communication driver type"
+send "1\r"
+expect -re "Add MyDeployment*"
+send "yes\r"
 expect eof
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: |