diff --git a/.craft.yml b/.craft.yml
index 92a3ce64..9821efab 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -1,16 +1,26 @@
 minVersion: "2.19.0"
-changelogPolicy: auto
+changelog:
+  policy: auto
 artifactProvider:
   name: none
 statusProvider:
   name: github
   config:
     contexts:
-    - 'build-arm64'
-    - 'build-amd64'
-    - 'assemble-taskbroker-image'
+      - 'build-arm64'
+      - 'build-amd64'
+      - 'assemble-taskbroker-image'
 preReleaseCommand: ""
 targets:
-- name: github
+  - id: release
+    name: docker
+    source: ghcr.io/getsentry/taskbroker
+    target: ghcr.io/getsentry/taskbroker
+  - id: latest
+    name: docker
+    source: ghcr.io/getsentry/taskbroker
+    target: ghcr.io/getsentry/taskbroker
+    targetFormat: '{{{target}}}:latest'
+  - name: github
 versioning:
   policy: calver
diff --git a/.github/workflows/release-ghcr-version-tag.yml b/.github/workflows/release-ghcr-version-tag.yml
deleted file mode 100644
index 8d4cd8f3..00000000
--- 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@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Tag release version
-        run: |
-          docker buildx imagetools create --tag \
-           ghcr.io/getsentry/taskbroker:${{ github.ref_name }} \
-           ghcr.io/getsentry/taskbroker:${{ github.sha }}
-
-      - name: Tag latest version
-        run: |
-          docker buildx imagetools create --tag \
-           ghcr.io/getsentry/taskbroker:latest \
-           ghcr.io/getsentry/taskbroker:${{ github.sha }}
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
new file mode 100755
index 00000000..e71bc3dd
--- /dev/null
+++ b/scripts/bump-version.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -euo pipefail
+
+if [ "$(uname -s)" != "Linux" ]; then
+    echo "This script can only be run on Linux!"
+    echo "Please use the GitHub Action instead."
+    exit 1
+fi
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $SCRIPT_DIR/..
+
+OLD_VERSION="${1}"
+NEW_VERSION="${2}"
+
+echo "Current version: ${OLD_VERSION}"
+echo "Bumping version: ${NEW_VERSION}"