diff --git a/.craft.yml b/.craft.yml
index 246384b..951cf6d 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -1,24 +1,28 @@
-github:
-  owner: getsentry
-  repo: chartcuterie
-
-changelogPolicy: auto
-
-statusProvider:
-  name: github
+minVersion: "2.19.0"
+changelog:
+  policy: auto
 artifactProvider:
+  name: none
+statusProvider:
   name: github
-
+  config:
+    contexts:
+      - 'build-docker-image-arm64'
+      - 'build-docker-image-amd64'
+      - 'assemble-chartcuterie-image'
 targets:
   - id: release
     name: docker
-    source: us-docker.pkg.dev/sentryio/chartcuterie-mr/image
-    target: getsentry/chartcuterie
+    source: ghcr.io/getsentry/chartcuterie
+    target: ghcr.io/getsentry/chartcuterie
   - id: latest
     name: docker
-    source: us-docker.pkg.dev/sentryio/chartcuterie-mr/image
-    target: getsentry/chartcuterie
+    source: ghcr.io/getsentry/chartcuterie
+    target: ghcr.io/getsentry/chartcuterie
     targetFormat: "{{{target}}}:latest"
   - name: npm
     access: public
   - name: github
+
+versioning:
+  policy: calver
\ No newline at end of file
diff --git a/.github/workflows/release-ghcr-version-tag.yml b/.github/workflows/release-ghcr-version-tag.yml
deleted file mode 100644
index 79dd5e9..0000000
--- a/.github/workflows/release-ghcr-version-tag.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Release GHCR Versioned Image
-
-on:
-  release:
-    types: [prereleased, released]
-
-jobs:
-  release-ghcr-version-tag:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Tag release version
-        run: |
-          docker buildx imagetools create --tag \
-           ghcr.io/getsentry/chartcuterie:${{ github.ref_name }} \
-           ghcr.io/getsentry/chartcuterie:${{ github.sha }}
-
-      - name: Tag latest version
-        run: |
-          docker buildx imagetools create --tag \
-           ghcr.io/getsentry/chartcuterie:latest \
-           ghcr.io/getsentry/chartcuterie:${{ github.sha }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c2bf0ca..eeced34 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
           fetch-depth: 0
 
       - name: Prepare release
-        uses: getsentry/craft@c6e2f04939b6ee67030588afbb5af76b127d8203 # v2
+        uses: getsentry/craft@v2 # Not pinned to avoid churn in Craft's releases
         env:
           GITHUB_TOKEN: ${{ steps.token.outputs.token }}
         with: