diff --git a/.github/workflows/modtest-dev.yaml b/.github/workflows/modtest-dev.yaml
deleted file mode 100644
index c98e5f1..0000000
--- a/.github/workflows/modtest-dev.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: "ModTest: dev"
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-    
-jobs:
-  modtest:
-    if : ${{ github.event_name }} == "pull_request"
-    uses: HappyPathway/centralized-actions/.github/workflows/modtest.yml@main
-    with:
-      workspace: dev
-      workspace_repo: github-repos
-      workspace_branch: main
-      repo_clone_type: https
-      mod_source: repo/github
-
-      github_server: ${{vars.GH_SERVER}}
-      github_org:  ${{ github.repository_owner }} 
-      branch: ${{ github.head_ref }}
-      terraform_version: ${{vars.TERRAFORM_VERSION}}
-      terraform_api_token_name: ${{ vars.TERRAFORM_API_TOKEN_NAME }}
-      terraform_api: ${{vars.TERRAFORM_API}}
-       
-    secrets:
-      TFE_TOKEN: ${{ secrets.TFE_TOKEN }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/terraform-test.yml b/.github/workflows/terraform-test.yml
index 82e71ae..af5d0ab 100644
--- a/.github/workflows/terraform-test.yml
+++ b/.github/workflows/terraform-test.yml
@@ -9,6 +9,11 @@ on:
       - main
   workflow_dispatch:
 
+# Set concurrency to prevent overlapping workflow runs
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
+
 permissions:
   contents: write
   pull-requests: write
diff --git a/.github/workflows/terraform.yaml b/.github/workflows/terraform.yaml
deleted file mode 100644
index 0df3f90..0000000
--- a/.github/workflows/terraform.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-name: "Terraform Validate"
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-
-env:
-  GITHUB_OWNER: ${{ vars.GH_ORG }}
-  GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-  GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
-  TF_WORKSPACE: happypathway
-  TFE_TOKEN: ${{ secrets.TFE_TOKEN }}
-  
-jobs:
-  setup-terraform:
-    outputs:
-      commit_sha: ${{ steps.checkout.outputs.commit }}
-        
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-        id: checkout
-          
-      - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v3.1.2
-        with:
-          terraform_version: ${{ vars.terraform_version }}
-          cli_config_credentials_token: ${{ secrets.TFE_TOKEN }}
-          cli_config_credentials_hostname: ${{ vars.terraform_api }}
-          
-      - name: terraform init
-        run: terraform init -upgrade
-
-      - uses: actions/upload-artifact@master
-        name: Archive Configuration
-        if: github.ref == 'refs/heads/main'
-        with:
-          name: terraform_dir
-          path: .terraform
-          retention-days: 1
-          include-hidden-files: true
-
-      - uses: actions/upload-artifact@master
-        name: Archive Lockfile
-        if: github.ref == 'refs/heads/main'
-        with:
-          name: terraform_lockfile
-          path: .terraform.lock.hcl
-          retention-days: 1
-          include-hidden-files: true
-          
-  terraform-validate:
-    needs: setup-terraform
-    uses: HappyPathway/centralized-actions/.github/workflows/terraform-test.yml@main
-    with:
-      terraform_version: ${{ vars.terraform_version }}
-      terraform_api: ${{ vars.terraform_api }}
-      github_username: ${{ github.actor }}
-      github_email: ${{ github.actor }}@roknsound.com
-      github_org: ${{ github.repository_owner }}
-      setup_terraform: true
-      terraform_init: false
-      cache: ${{ github.workspace }}
-      download_cache: true
-      commit_sha: ${{ needs.setup-terraform.outputs.commit_sha }}
-    secrets:
-      TFE_TOKEN: ${{ secrets.TFE_TOKEN }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
-     
-  gtag:
-    needs: terraform-validate
-    if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
-    uses: HappyPathway/centralized-actions/.github/workflows/gtag.yml@main
-    with:
-      patch: true
-      github_org: ${{ vars.GH_ORG }}
-      github_username: ${{ vars.GH_USERNAME }}
-      github_email: ${{ vars.GH_EMAIL }}
-    secrets:
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}