diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml
index 272e599f6..c0dff9a4d 100644
--- a/.github/actions/setup/action.yaml
+++ b/.github/actions/setup/action.yaml
@@ -2,13 +2,13 @@
 name: "Setup Environment"
 description: "UDS Environment Setup"
 inputs:
-  gh_token:
+  ghToken:
     description: 'GITHUB_TOKEN'
     required: true
-  ib_user:
+  registry1Username:
     description: 'IRON_BANK_ROBOT_USERNAME'
     required: true
-  ib_password:
+  registry1Password:
     description: 'IRON_BANK_ROBOT_PASSWORD'
     required: true
 
@@ -31,3 +31,18 @@ runs:
       shell: bash
       # renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
       run: brew install defenseunicorns/tap/uds@0.11.0
+
+    - name: Iron Bank Login
+      if: ${{ inputs.registry1Username != '' }}
+      env:
+        REGISTRY_USERNAME: ${{ inputs.registry1Username }}
+        REGISTRY_PASSWORD: ${{ inputs.registry1Password }}
+      run: echo "${{ env.REGISTRY_PASSWORD }}" | uds zarf tools registry login -u "${{ env.REGISTRY_USERNAME }}" --password-stdin registry1.dso.mil
+      shell: bash
+
+    - name: GHCR Login
+      if: ${{ inputs.ghToken != '' }}
+      env:
+        GH_TOKEN: ${{ inputs.ghToken }}
+      run: echo "${{ env.GH_TOKEN }}" | uds zarf tools registry login -u "dummy" --password-stdin ghcr.io
+      shell: bash
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 52e73ad96..a78140303 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -25,12 +25,10 @@ jobs:
 
       - name: Environment setup
         uses: ./.github/actions/setup
-
-      - name: Login to GHCR
-        run: uds run registry-login --set REGISTRY=ghcr.io --set REGISTRY_USERNAME=dummy --set REGISTRY_PASSWORD=${{ secrets.GITHUB_TOKEN }} --set REGISTRY_RETRY_INTERVAL=90 --no-progress
-
-      - name: Login to registry1
-        run: uds run registry-login --set REGISTRY=registry1.dso.mil --set REGISTRY_USERNAME=${{ secrets.IRON_BANK_ROBOT_USERNAME }} --set REGISTRY_PASSWORD=${{ secrets.IRON_BANK_ROBOT_PASSWORD }} --set REGISTRY_RETRY_INTERVAL=90 --no-progress
+        with:
+          registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
+          registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
+          ghToken: ${{ secrets.GITHUB_TOKEN }}
 
       - name: (Snapshot) Get snapshot version using git commit short sha and date
         if: ${{ inputs.snapshot }}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index bc1b01ebb..740bc8b26 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -49,12 +49,10 @@ jobs:
 
       - name: Environment setup
         uses: ./.github/actions/setup
-
-      - name: Login to GHCR
-        run: uds run registry-login --set REGISTRY=ghcr.io --set REGISTRY_USERNAME=dummy --set REGISTRY_PASSWORD=${{ secrets.GITHUB_TOKEN }} --set REGISTRY_RETRY_INTERVAL=90 --no-progress
-
-      - name: Login to registry1
-        run: uds run registry-login --set REGISTRY=registry1.dso.mil --set REGISTRY_USERNAME=${{ secrets.IRON_BANK_ROBOT_USERNAME }} --set REGISTRY_PASSWORD=${{ secrets.IRON_BANK_ROBOT_PASSWORD }} --set REGISTRY_RETRY_INTERVAL=90 --no-progress
+        with:
+          registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
+          registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
+          ghToken: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Test a single source package
         if: ${{ inputs.package != 'all' && inputs.test_type == 'install' }}
diff --git a/tasks.yaml b/tasks.yaml
index 58bd078f8..4c166497b 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -13,7 +13,6 @@ includes:
   - deploy: ./tasks/deploy.yaml
   - test: ./tasks/test.yaml
   - lint: ./tasks/lint.yaml
-  - common-setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.3.6/tasks/setup.yaml
 
 tasks:
 
@@ -61,15 +60,6 @@ tasks:
     actions:
       - task: setup:k3d-test-cluster
 
-  - name: registry-login
-    actions:
-      - task: common-setup:registry-login
-        with:
-          registry: ${REGISTRY}
-          registryUsername: ${REGISTRY_USERNAME}
-          registryPassword: ${REGISTRY_PASSWORD}
-          registryRetryInterval: ${REGISTRY_RETRY_INTERVAL}
-
   - name: create-single-package
     actions:
       - task: create:single-package