diff --git a/.github/workflows/SHiELD_parallelworks_intel.yml b/.github/workflows/SHiELD_parallelworks_intel.yml
index ec679ca09..d4685a0d0 100644
--- a/.github/workflows/SHiELD_parallelworks_intel.yml
+++ b/.github/workflows/SHiELD_parallelworks_intel.yml
@@ -27,7 +27,7 @@ jobs:
     # this is enough nodes for the first 17 tests to run in parallel, and we
     # have 17 runners configured.
     - run: salloc --partition=p2 -N 46 -J $GITHUB_REF sleep 20m &
-    - run: /contrib/fv3/intelFV3CIScripts/checkout.sh $GITHUB_REF
+    - run: /contrib/fv3/GFDL_atmos_cubed_sphere_CI/checkout.sh $GITHUB_REF
     
   build:
     runs-on: [self-hosted,devcimultiintel]
@@ -37,7 +37,7 @@ jobs:
       fail-fast: true
       max-parallel: 3
       matrix:
-        runpath: [/contrib/fv3/intelFV3CIScripts/]
+        runpath: [/contrib/fv3/GFDL_atmos_cubed_sphere_CI/]
         runscript: [swcompile.sh, nhcompile.sh, hydrocompile.sh]
     steps:
       - env:
@@ -53,7 +53,7 @@ jobs:
       fail-fast: false
       max-parallel: 17
       matrix:
-        runpath: [/contrib/fv3/intelFV3CIScripts/]
+        runpath: [/contrib/fv3/GFDL_atmos_cubed_sphere_CI/]
         runscript:
           # These are placed in order of largest to smallest jobs
           #layout 8,8 needs 8 nodes on dvcimultiintel cluster
diff --git a/.github/workflows/daily_cleanup_parallelworks.yaml b/.github/workflows/daily_cleanup_parallelworks.yaml
new file mode 100644
index 000000000..33078a97a
--- /dev/null
+++ b/.github/workflows/daily_cleanup_parallelworks.yaml
@@ -0,0 +1,17 @@
+name: Old Build Cleanup
+
+# This GitHub Action Workflow is runing on the devcimultiintel cluster
+# This will delete all build directories older than 30 days
+# Build directories are on the cloud at /contrib/fv3/2023.2.0
+
+on:
+  schedule:
+    # run daily at midnight
+    - cron: '0 0 * * *'
+
+jobs:
+  delete:
+    runs-on: [self-hosted, devcimultiintel]
+    name: Delete Builds
+    steps:
+      - run: find /contrib/fv3/2023.2.0/GFDL_atmos_cubed_sphere/refs/pull -maxdepth 1 -mindepth 1 -mtime +30 -type d -print -delete