diff --git a/.github/workflows/dockerimage-ci.yml b/.github/workflows/dockerimage-ci.yml
index 3828354..437002d 100644
--- a/.github/workflows/dockerimage-ci.yml
+++ b/.github/workflows/dockerimage-ci.yml
@@ -91,8 +91,6 @@ jobs:
       run: make "OWNER=$OWNER_LC" VERSION=edge build
     - name: Push the Docker images
       run: make "OWNER=$OWNER_LC" VERSION=edge push
-    - name: Push the Docker manifest
-      run: make "OWNER=$OWNER_LC" VERSION=edge release
 
   build_release:
     name: "Build release Docker images"
diff --git a/Makefile b/Makefile
index 5609aa7..0ea12db 100644
--- a/Makefile
+++ b/Makefile
@@ -30,10 +30,10 @@ endif
 
 build:
 ifeq ($(_build_amd64),1)
-	docker buildx build --load --platform "linux/amd64" --rm -t $(IMAGE)-amd64:$(VERSION) --pull --build-arg DISABLE_OPTIMIZATIONS=$(DISABLE_OPTIMIZATIONS) .
+	docker buildx build --load --platform "linux/amd64" --rm -t $(IMAGE):$(VERSION)-amd64 --pull --build-arg DISABLE_OPTIMIZATIONS=$(DISABLE_OPTIMIZATIONS) .
 endif
 ifeq ($(_build_arm64),1)
-	docker buildx build --load --platform "linux/arm64" --rm -t $(IMAGE)-arm64:$(VERSION) --pull --build-arg DISABLE_OPTIMIZATIONS=$(DISABLE_OPTIMIZATIONS) .
+	docker buildx build --load --platform "linux/arm64" --rm -t $(IMAGE):$(VERSION)-arm64 --pull --build-arg DISABLE_OPTIMIZATIONS=$(DISABLE_OPTIMIZATIONS) .
 endif
 
 test: