diff --git a/.github/workflows/general-worker.yaml b/.github/workflows/general-worker.yaml
index b594d97..cfc64fe 100644
--- a/.github/workflows/general-worker.yaml
+++ b/.github/workflows/general-worker.yaml
@@ -37,3 +37,11 @@ jobs:
           ghcr.io/haiku/general-worker:${{ steps.detect-version.outputs.RELEASE_VERSION }}-amd64
           ghcr.io/haiku/general-worker:${{ steps.detect-version.outputs.RELEASE_VERSION }}-arm64
         platforms: linux/amd64,linux/arm64
+    - uses: int128/docker-manifest-create-action@v2
+      with:
+        tags: ghcr.io/haiku/general-worker:${{ steps.detect-version.outputs.RELEASE_VERSION }}
+      sources: |
+        ghcr.io/haiku/general-worker:${{ steps.detect-version.outputs.RELEASE_VERSION }}-amd64
+        ghcr.io/haiku/general-worker:${{ steps.detect-version.outputs.RELEASE_VERSION }}-arm64
+
+
diff --git a/containers/general-worker/Makefile b/containers/general-worker/Makefile
index 4644480..50b14fc 100644
--- a/containers/general-worker/Makefile
+++ b/containers/general-worker/Makefile
@@ -1,14 +1,7 @@
-VERSION = 20241228
+VERSION = 19000101
 REGISTRY = ghcr.io/haiku
 HOST = `uname -m`
 default:
 	podman build --pull --no-cache --tag ${REGISTRY}/general-worker:${VERSION}-${HOST} .
 enter:
-	podman run -it ${REGISTRY}/general-worker:${VERSION} /bin/bash -l
-push:
-	podman push ${REGISTRY}/general-worker:${VERSION}-${HOST}
-push-manifest:
-	# Make sure you have all the intended images built and pushed ;-)
-	podman manifest create ${REGISTRY}/general-worker:${VERSION} \
-		--amend ${REGISTRY}/general-worker:${VERSION}-x86_64 \
-		--amend ${REGISTRY}/general-worker:${VERSION}-aarch64 \
+	podman run -it ${REGISTRY}/general-worker:${VERSION}-${HOST} /bin/bash -l