diff --git a/.github/workflows/build_new.yml b/.github/workflows/build_new.yml
index 3f14c6d..e1756a6 100644
--- a/.github/workflows/build_new.yml
+++ b/.github/workflows/build_new.yml
@@ -59,7 +59,7 @@ jobs:
 
   # TEST Stage equivalent
   test:
-    name: Run Tests
+    name: Run Integration Tests
     needs: build # Ensure this job runs after the build job
     # Define necessary permissions if needed (e.g., for GitHub Packages)
     permissions:
diff --git a/.github/workflows/debug_env.yml b/.github/workflows/debug_env.yml
new file mode 100644
index 0000000..4b1c4a4
--- /dev/null
+++ b/.github/workflows/debug_env.yml
@@ -0,0 +1,12 @@
+name: Debug Environment
+
+on:
+  workflow_dispatch:  # Allows manual triggering
+
+jobs:
+  debug:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Print GITHUB_REPOSITORY
+        run: |
+          echo "GITHUB_REPOSITORY: ${{ github.repository }}"
\ No newline at end of file
diff --git a/.github/workflows/app-testing.yml b/.github/workflows/obsolete/app-testing.yml
similarity index 100%
rename from .github/workflows/app-testing.yml
rename to .github/workflows/obsolete/app-testing.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/obsolete/build.yml
similarity index 100%
rename from .github/workflows/build.yml
rename to .github/workflows/obsolete/build.yml
diff --git a/.github/workflows/template_build.yml b/.github/workflows/template_build.yml
index 5755a36..455a0aa 100644
--- a/.github/workflows/template_build.yml
+++ b/.github/workflows/template_build.yml
@@ -2,9 +2,6 @@ name: Reusable Docker Build Template
 
 # Define inputs expected from the calling workflow
 on:
-  push:
-    branches:
-      - develop
   workflow_call:
     inputs:
       project_name:
@@ -42,6 +39,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: develop # Use the branch specified in the calling workflow
+
       - name: Set up Docker Buildx
         # Recommended for improved build features and caching
         uses: docker/setup-buildx-action@v3
@@ -56,7 +54,6 @@ jobs:
         run: |
           echo "Pruning Docker system..."
           docker system prune -a -f --volumes
-        # Comment from ADO: we clear the cache to prevent it from filling up...
 
       - name: Remove unnecessary files
         run: |
diff --git a/.github/workflows/template_test.yml b/.github/workflows/template_test.yml
index 23e27b7..79903e8 100644
--- a/.github/workflows/template_test.yml
+++ b/.github/workflows/template_test.yml
@@ -49,16 +49,28 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           ref: develop 
-          fetch-depth: 1
 
       - name: Log in to GitHub Packages
         run: echo ${GITHUB_TOKEN} | docker login -u ${GITHUB_ACTOR} --password-stdin ghcr.io
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Nuke Docker Cache
+        # Equivalent to CmdLine@2 Nuke Cache
+        run: |
+          echo "Pruning Docker system..."
+          docker system prune -a -f --volumes
+
+      - name: Remove unnecessary files
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
       - name: Create Docker-Compose File from Inputs
         id: create_compose
         shell: pwsh