diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 633424100a..28b565875a 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -9,9 +9,7 @@ runs:
   steps:
   - run: git fetch --tags
     shell: bash
-  - name: Add Python bin to PATH
-    run: echo "/Library/Frameworks/Python.framework/Versions/Current/bin" >> $GITHUB_PATH
-    shell: bash
+  # Python path should be added at a higher level
   - run: pip3 install setuptools_scm wheel urllib3
     shell: bash
   - run: pip3 install -U -r ${{ inputs.location }}/requirements.txt
diff --git a/.github/workflows/build-test-macos.yml b/.github/workflows/build-test-macos.yml
index 0514ef4387..b27a2aec88 100644
--- a/.github/workflows/build-test-macos.yml
+++ b/.github/workflows/build-test-macos.yml
@@ -27,6 +27,9 @@ jobs:
       with:
         fetch-depth: 0
         submodules: true
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.12' 
     - uses: ./.github/actions/setup
     - name: F prime CI step
       run: ./ci/tests/Framework.bash
@@ -51,6 +54,9 @@ jobs:
       with:
         fetch-depth: 0
         submodules: true
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.12' 
     - uses: ./.github/actions/setup
     - name: F prime CI step
       run: ./ci/tests/Ref.bash
@@ -74,6 +80,9 @@ jobs:
       with:
         fetch-depth: 0
         submodules: true
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.12' 
     - uses: ./.github/actions/setup
     - name: Install coreutils
       run: brew install coreutils
diff --git a/Autocoders/Python/src/fprime_ac/generators/templates/CMakeLists.txt b/Autocoders/Python/src/fprime_ac/generators/templates/CMakeLists.txt
index 504b5460c3..d7c8a435ee 100644
--- a/Autocoders/Python/src/fprime_ac/generators/templates/CMakeLists.txt
+++ b/Autocoders/Python/src/fprime_ac/generators/templates/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Add codegen target to cache
-set(CODEGEN_TARGET "codegen" CACHE INTERNAL "Target for codegen autocoder")
+set(CODEGEN_TARGET "fprime_codegen" CACHE INTERNAL "Target for codegen autocoder")
 set_property(GLOBAL PROPERTY CODEGEN_OUTPUTS)
 
 # Create target for autocoder
diff --git a/requirements.txt b/requirements.txt
index 23428553ca..8e03123ba6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,10 +8,10 @@ Brotli==1.1.0
 certifi==2024.8.30
 chardet==5.2.0
 charset-normalizer==3.4.0
-Cheetah3==3.2.6.post1
 click==8.1.7
 colorlog==6.8.2
 cookiecutter==2.6.0
+CT3==3.3.3.post1
 et-xmlfile==1.1.0
 Flask==3.0.3
 Flask-Compress==1.15