diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml
deleted file mode 100644
index cdf5bb4..0000000
--- a/.github/actions/setup/action.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# action.yml
-name: "Setup Environment"
-description: "UDS Environment Setup"
-
-inputs:
-  download-init-package:
-    description: "whether to download the zarf init package or not"
-    default: "true"
-  install-k3d:
-    description: "whether to install k3d or not"
-    default: "true"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Install Zarf
-      uses: defenseunicorns/setup-zarf@main
-      with:
-        # renovate: datasource=github-tags depName=defenseunicorns/zarf versioning=semver
-        version: v0.32.1
-        download-init-package: ${{ inputs.download-init-package }}
-
-    - name: Install k3d
-      if: ${{ inputs.install-k3d == 'true' }}
-      shell: bash
-      run: curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | TAG=v5.6.0 bash
-
-    - name: Set up Homebrew
-      uses: Homebrew/actions/setup-homebrew@master
-
-    - name: Install UDS CLI
-      shell: bash
-      # renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
-      run: brew install defenseunicorns/tap/uds@0.6.1
diff --git a/.github/workflows/pull-requests.yaml b/.github/workflows/pull-requests.yaml
index 4d71c1f..7b6b9a4 100644
--- a/.github/workflows/pull-requests.yaml
+++ b/.github/workflows/pull-requests.yaml
@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Environment setup
-        uses: ./.github/actions/setup
+        uses: defenseunicorns/uds-common/.github/actions/setup@417b9c2bc088f664c616c9929a2b3ce448d251f7
       
       - name: Iron Bank Login
         if: ${{ matrix.flavor == 'registry1' }}
diff --git a/.github/workflows/tag-and-release.yaml b/.github/workflows/tag-and-release.yaml
index f485cd1..42ad476 100644
--- a/.github/workflows/tag-and-release.yaml
+++ b/.github/workflows/tag-and-release.yaml
@@ -36,10 +36,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Environment setup
-        uses: ./.github/actions/setup
-        with:
-          download-init-package: false
-          install-k3d: false
+        uses: defenseunicorns/uds-common/.github/actions/setup@417b9c2bc088f664c616c9929a2b3ce448d251f7
 
       - name: Iron Bank Login
         run: zarf tools registry login -u "${{secrets.IRON_BANK_ROBOT_USERNAME}}" -p "${{secrets.IRON_BANK_ROBOT_PASSWORD}}" registry1.dso.mil