diff --git a/.github/workflows/central-controller-cv1.yaml b/.github/workflows/central-controller-cv1.yaml
index 85a6b410a..5c3e391d6 100644
--- a/.github/workflows/central-controller-cv1.yaml
+++ b/.github/workflows/central-controller-cv1.yaml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Build & Push Docker Image
         run: |
-          make central-controller-docker-${{ runner.arch }} --no-print-directory
+          docker build --no-cache -t registry.zerotier.com/zerotier-central/ztcentral-controller:${{ env.COMMIT_SHORT_SHA }}-${{ steps.branch.outputs.branch_name }}-${{ runner.arch }}-amd64 -f ext/central-controller-docker/Dockerfile . --push
 
   multi-arch-docker:
     runs-on: gha-runner-x64
diff --git a/make-linux.mk b/make-linux.mk
index 10780fdcb..07f197f6a 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -475,13 +475,6 @@ central-controller-docker: _buildx FORCE
 central-controller-docker-X64: FORCE
 	docker build --platform linux/amd64 --no-cache -t registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP}-amd64 -f ext/central-controller-docker/Dockerfile . --push
 
-central-controller-docker-ARM64: FORCE
-	docker build --platform linux/arm64 --no-cache -t registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP}-arm64 -f ext/central-controller-docker/Dockerfile . --push
-
-centralv2-controller-docker: _buildx FORCE
-	docker buildx build --platform linux/amd64,linux/arm64 --no-cache -t us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:$(shell git rev-parse --short HEAD) -f ext/central-controller-docker/Dockerfile --build-arg git_branch=`git name-rev --name-only HEAD` . --push
-	@echo Image: us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:$(shell git rev-parse --short HEAD)
-
 debug:	FORCE
 	make ZT_DEBUG=1 one
 	make ZT_DEBUG=1 selftest