diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml
deleted file mode 100644
index cbe55c59..00000000
--- a/.github/actions/setup/action.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# action.yml
-name: "Setup Environment"
-description: "UDS Environment Setup"
-
-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.2
-        download-init-package: true
-
-    - name: Install k3d
-      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.7.0
diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml
index 4fdf2118..c83ce2b0 100644
--- a/.github/workflows/commitlint.yaml
+++ b/.github/workflows/commitlint.yaml
@@ -3,28 +3,9 @@ name: Metadata
 on:
   pull_request:
     branches: [main]
-    types: [opened, edited, synchronize]
+    types: [milestoned, opened, edited, synchronize]
 
 jobs:
-  title_check:
-    runs-on: ubuntu-latest
-    name: Validate PR Title
-    permissions:
-      pull-requests: read
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        with:
-          fetch-depth: 0
-
-      - name: Setup Node.js
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
-
-      - name: Install commitlint
-        run: |
-          npm install --save-dev @commitlint/config-conventional@18.6.0
-          npm install --save-dev @commitlint/cli@18.6.0
-
-      - name: Lint PR title
-        run: echo "${{ github.event.pull_request.title }}" | npx commitlint
+  validate:
+    name: Validate
+    uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@417b9c2bc088f664c616c9929a2b3ce448d251f7
diff --git a/.github/workflows/tag-and-release.yaml b/.github/workflows/tag-and-release.yaml
index 493ab279..5bdfa49e 100644
--- a/.github/workflows/tag-and-release.yaml
+++ b/.github/workflows/tag-and-release.yaml
@@ -36,10 +36,10 @@ 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
-        run: zarf tools registry login -u "${{secrets.IRON_BANK_ROBOT_USERNAME}}" -p "${{secrets.IRON_BANK_ROBOT_PASSWORD}}" registry1.dso.mil
+        run: uds zarf tools registry login -u "${{secrets.IRON_BANK_ROBOT_USERNAME}}" -p "${{secrets.IRON_BANK_ROBOT_PASSWORD}}" registry1.dso.mil
     
       - name: Login to GHCR
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 8c2c6ac7..b684687f 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -34,10 +34,10 @@ 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
-        run: zarf tools registry login -u "${{secrets.IRON_BANK_ROBOT_USERNAME}}" -p "${{secrets.IRON_BANK_ROBOT_PASSWORD}}" registry1.dso.mil
+        run: uds zarf tools registry login -u "${{secrets.IRON_BANK_ROBOT_USERNAME}}" -p "${{secrets.IRON_BANK_ROBOT_PASSWORD}}" registry1.dso.mil
 
       - name: Create test bundle
         run: uds run create-test-bundle --set FLAVOR=${{ matrix.flavor }}
diff --git a/common/zarf.yaml b/common/zarf.yaml
new file mode 100644
index 00000000..ac258ed3
--- /dev/null
+++ b/common/zarf.yaml
@@ -0,0 +1,23 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/zarf/main/zarf.schema.json
+kind: ZarfPackageConfig
+metadata:
+  name: mattermost-common
+  description: "UDS Mattermost Common Package" 
+
+components:
+  - name: mattermost
+    required: true
+    charts:
+      - name: uds-mattermost-config
+        namespace: mattermost
+        version: 0.1.0
+        localPath: ../chart
+        valuesFiles:
+          - ../values/config-values.yaml
+      - name: mattermost-enterprise-edition
+        namespace: mattermost
+        url: https://helm.mattermost.com
+        gitPath: chart
+        version: 2.6.43
+        valuesFiles:
+          - ../values/common-values.yaml
\ No newline at end of file
diff --git a/tasks.yaml b/tasks.yaml
index 4b739b5e..2d945049 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -1,8 +1,8 @@
 includes:
   - cleanup: ./tasks/cleanup.yaml
   - create: ./tasks/create.yaml
-  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common-tasks/v0.1.4/tasks/deploy.yaml
-  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common-tasks/v0.1.4/tasks/setup.yaml
+  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common-tasks/v0.2.1/tasks/deploy.yaml
+  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common-tasks/v0.2.1/tasks/setup.yaml
   - test: ./tasks/test.yaml
 
 tasks:
diff --git a/tasks/create.yaml b/tasks/create.yaml
index 97bad89a..d9dce4e7 100644
--- a/tasks/create.yaml
+++ b/tasks/create.yaml
@@ -1,5 +1,5 @@
 includes:
-  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common-tasks/v0.1.4/tasks/create.yaml
+  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common-tasks/v0.2.1/tasks/create.yaml
 
 tasks:
   - name: mattermost-test-bundle
@@ -17,4 +17,4 @@ tasks:
   - name: dependency-package
     description: Create the Dependency Zarf Package
     actions:
-      - cmd: zarf package create src/dev-secrets/ --confirm --no-progress --architecture=${UDS_ARCH}
+      - cmd: uds zarf package create src/dev-secrets/ --confirm --no-progress --architecture=${UDS_ARCH}
diff --git a/tasks/publish.yaml b/tasks/publish.yaml
index 41594d41..68d5fa5a 100644
--- a/tasks/publish.yaml
+++ b/tasks/publish.yaml
@@ -1,5 +1,5 @@
 includes:
-  - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common-tasks/v0.1.4/tasks/publish.yaml
+  - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common-tasks/v0.2.1/tasks/publish.yaml
 
 variables:
   - name: TARGET_REPO
diff --git a/values/values.yaml b/values/common-values.yaml
similarity index 100%
rename from values/values.yaml
rename to values/common-values.yaml
diff --git a/zarf.yaml b/zarf.yaml
index d5d22979..7ef5dab8 100644
--- a/zarf.yaml
+++ b/zarf.yaml
@@ -24,22 +24,13 @@ components:
   - name: mattermost
     required: true
     description: "Deploy Mattermost"
+    import:
+      path: common
     only:
       flavor: upstream
     charts:
-      - name: uds-mattermost-config
-        namespace: mattermost
-        version: 0.1.0
-        localPath: chart
-        valuesFiles:
-          - values/config-values.yaml
       - name: mattermost-enterprise-edition
-        namespace: mattermost
-        url: https://helm.mattermost.com
-        gitPath: chart
-        version: 2.6.43
         valuesFiles:
-          - values/values.yaml
           - values/upstream-values.yaml
     images:
       - appropriate/curl:latest
@@ -48,24 +39,15 @@ components:
   - name: mattermost
     required: true
     description: "Deploy Mattermost"
+    import:
+      path: common
     only:
       flavor: registry1
       cluster:
         architecture: amd64
     charts:
-      - name: uds-mattermost-config
-        namespace: mattermost
-        version: 0.1.0
-        localPath: chart
-        valuesFiles:
-          - values/config-values.yaml
       - name: mattermost-enterprise-edition
-        namespace: mattermost
-        url: https://helm.mattermost.com
-        gitPath: chart
-        version: 2.6.43
         valuesFiles:
-          - values/values.yaml
           - values/registry1-values.yaml
     images:
       - registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.3