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..60069e6ed58 100644
--- a/.github/workflows/component.exp
+++ b/.github/workflows/component.exp
@@ -1,15 +1,20 @@
-set timeout 120
+set timeout 80
 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 "  [1/8] Component name (MyComponent): "
+send "MyComponent\r"
+expect "  [2/8] Component short description (Component for F Prime FSW framework.): "
+send "test component"
+expect "  [3/8] Component namespace (Components): "
+send "Components"
+expect "  [4/8] Select component kind"
+send "1\r"
+expect "  [5/8] Enable Commands?" 
+send "1\r"
+expect "  [6/8] Enable Telemetry?"
+send "1\r"
+expect "  [7/8] Enable Parameters?"
+send "1\r"
+expect "Add MyComponent to MyProject/project.cmake at end of file? (yes/no) [yes]: "
+send "yes\r"
+expect "Generate implementation files? (yes/no) [yes]: "
 expect eof
diff --git a/.github/workflows/deployment.exp b/.github/workflows/deployment.exp
index 4cdee06b5cc..2bfccd28927 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 "Choose from [1/2/3] (1):"
+send "2\r"
+expect "Add MyDeployment to MyProject/project.cmake at end of file? (yes/no) [yes]:"
+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: |