diff --git a/app/victoria-metrics/Makefile b/app/victoria-metrics/Makefile
index 9a787a9531..f20a178380 100644
--- a/app/victoria-metrics/Makefile
+++ b/app/victoria-metrics/Makefile
@@ -9,6 +9,9 @@ victoria-metrics-prod:
 victoria-metrics-pure-prod:
 	APP_NAME=victoria-metrics $(MAKE) app-via-docker-pure
 
+victoria-metrics-amd64-prod:
+	APP_NAME=victoria-metrics $(MAKE) app-via-docker-amd64
+
 victoria-metrics-arm-prod:
 	APP_NAME=victoria-metrics $(MAKE) app-via-docker-arm
 
@@ -27,6 +30,9 @@ package-victoria-metrics:
 package-victoria-metrics-pure:
 	APP_NAME=victoria-metrics $(MAKE) package-via-docker-pure
 
+package-victoria-metrics-amd64:
+	APP_NAME=victoria-metrics $(MAKE) package-via-docker-amd64
+
 package-victoria-metrics-arm:
 	APP_NAME=victoria-metrics $(MAKE) package-via-docker-arm
 
@@ -49,6 +55,9 @@ run-victoria-metrics:
 	ARGS='-graphiteListenAddr=:2003 -opentsdbListenAddr=:4242 -retentionPeriod=12 -search.maxUniqueTimeseries=1000000 -search.maxQueryDuration=10m' \
 	$(MAKE) run-via-docker
 
+victoria-metrics-amd64:
+	CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -mod=vendor -ldflags "$(GO_BUILDINFO)" -o bin/victoria-metrics-amd64 ./app/victoria-metrics
+
 victoria-metrics-arm:
 	CGO_ENABLED=0 GOOS=linux GOARCH=arm GO111MODULE=on go build -mod=vendor -ldflags "$(GO_BUILDINFO)" -o bin/victoria-metrics-arm ./app/victoria-metrics
 
diff --git a/app/vmbackup/Makefile b/app/vmbackup/Makefile
index 27735cee4b..842049767b 100644
--- a/app/vmbackup/Makefile
+++ b/app/vmbackup/Makefile
@@ -9,7 +9,10 @@ vmbackup-prod:
 vmbackup-pure-prod:
 	APP_NAME=vmbackup $(MAKE) app-via-docker-pure
 
-vmbackup--arm-prod:
+vmbackup-amd64-prod:
+	APP_NAME=vmbackup $(MAKE) app-via-docker-amd64
+
+vmbackup-arm-prod:
 	APP_NAME=vmbackup $(MAKE) app-via-docker-arm
 
 vmbackup-arm64-prod:
@@ -27,6 +30,9 @@ package-vmbackup:
 package-vmbackup-pure:
 	APP_NAME=vmbackup $(MAKE) package-via-docker-pure
 
+package-vmbackup-amd64:
+	APP_NAME=vmbackup $(MAKE) package-via-docker-amd64
+
 package-vmbackup-arm:
 	APP_NAME=vmbackup $(MAKE) package-via-docker-arm
 
@@ -45,6 +51,9 @@ publish-vmbackup:
 vmbackup-pure:
 	APP_NAME=vmbackup $(MAKE) app-local-pure
 
+vmbackup-amd64:
+	CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -mod=vendor -ldflags "$(GO_BUILDINFO)" -o bin/vmbackup-amd64 ./app/vmbackup
+
 vmbackup-arm:
 	CGO_ENABLED=0 GOOS=linux GOARCH=arm GO111MODULE=on go build -mod=vendor -ldflags "$(GO_BUILDINFO)" -o bin/vmbackup-arm ./app/vmbackup
 
diff --git a/app/vmrestore/Makefile b/app/vmrestore/Makefile
index fd5e8acc36..305bee9f22 100644
--- a/app/vmrestore/Makefile
+++ b/app/vmrestore/Makefile
@@ -9,7 +9,10 @@ vmrestore-prod:
 vmrestore-pure-prod:
 	APP_NAME=vmrestore $(MAKE) app-via-docker-pure
 
-vmrestore--arm-prod:
+vmrestore-amd64-prod:
+	APP_NAME=vmrestore $(MAKE) app-via-docker-amd64
+
+vmrestore-arm-prod:
 	APP_NAME=vmrestore $(MAKE) app-via-docker-arm
 
 vmrestore-arm64-prod:
@@ -27,6 +30,9 @@ package-vmrestore:
 package-vmrestore-pure:
 	APP_NAME=vmrestore $(MAKE) package-via-docker-pure
 
+package-vmrestore-amd64:
+	APP_NAME=vmrestore $(MAKE) package-via-docker-amd64
+
 package-vmrestore-arm:
 	APP_NAME=vmrestore $(MAKE) package-via-docker-arm
 
@@ -45,6 +51,9 @@ publish-vmrestore:
 vmrestore-pure:
 	APP_NAME=vmrestore $(MAKE) app-local-pure
 
+vmrestore-amd64:
+	CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -mod=vendor -ldflags "$(GO_BUILDINFO)" -o bin/vmrestore-amd64 ./app/vmrestore
+
 vmrestore-arm:
 	CGO_ENABLED=0 GOOS=linux GOARCH=arm GO111MODULE=on go build -mod=vendor -ldflags "$(GO_BUILDINFO)" -o bin/vmrestore-arm ./app/vmrestore
 
diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile
index bae7a7886e..58209b4b42 100644
--- a/deployment/docker/Makefile
+++ b/deployment/docker/Makefile
@@ -84,49 +84,61 @@ run-via-docker: package-via-docker
 
 app-via-docker-goarch:
 	APP_SUFFIX='-$(GOARCH)' \
-	DOCKER_OPTS='--env CGO_ENABLED=0 --env GOOS=linux --env GOARCH=$(GOARCH)' \
+	DOCKER_OPTS='--env CGO_ENABLED=$(CGO_ENABLED) --env GOOS=linux --env GOARCH=$(GOARCH)' \
 	$(MAKE) app-via-docker
 
+app-via-docker-goarch-cgo:
+	CGO_ENABLED=1 $(MAKE) app-via-docker-goarch
+
+app-via-docker-goarch-nocgo:
+	CGO_ENABLED=0 $(MAKE) app-via-docker-goarch
+
 app-via-docker-pure:
 	APP_SUFFIX='-pure' DOCKER_OPTS='--env CGO_ENABLED=0' $(MAKE) app-via-docker
 
 app-via-docker-amd64:
-	GOARCH=amd64 $(MAKE) app-via-docker-goarch
+	GOARCH=amd64 $(MAKE) app-via-docker-goarch-cgo
 
 app-via-docker-arm:
-	GOARCH=arm $(MAKE) app-via-docker-goarch
+	GOARCH=arm $(MAKE) app-via-docker-goarch-nocgo
 
 app-via-docker-arm64:
-	GOARCH=arm64 $(MAKE) app-via-docker-goarch
+	GOARCH=arm64 $(MAKE) app-via-docker-goarch-nocgo
 
 app-via-docker-ppc64le:
-	GOARCH=ppc64le $(MAKE) app-via-docker-goarch
+	GOARCH=ppc64le $(MAKE) app-via-docker-goarch-nocgo
 
 app-via-docker-386:
-	GOARCH=386 $(MAKE) app-via-docker-goarch
+	GOARCH=386 $(MAKE) app-via-docker-goarch-nocgo
 
 package-via-docker-goarch:
 	APP_SUFFIX='-$(GOARCH)' \
-	DOCKER_OPTS='--env CGO_ENABLED=0 --env GOOS=linux --env GOARCH=$(GOARCH)' \
+	DOCKER_OPTS='--env CGO_ENABLED=$(CGO_ENABLED) --env GOOS=linux --env GOARCH=$(GOARCH)' \
 	$(MAKE) package-via-docker
 
+package-via-docker-goarch-cgo:
+	CGO_ENABLED=1 $(MAKE) package-via-docker-goarch
+
+package-via-docker-goarch-nocgo:
+	CGO_ENABLED=0 $(MAKE) package-via-docker-goarch
+
 package-via-docker-pure:
 	APP_SUFFIX='-pure' DOCKER_OPTS='--env CGO_ENABLED=0' $(MAKE) package-via-docker
 
 package-via-docker-amd64:
-	GOARCH=amd64 $(MAKE) package-via-docker-goarch
+	GOARCH=amd64 $(MAKE) package-via-docker-goarch-cgo
 
 package-via-docker-arm:
-	GOARCH=arm $(MAKE) package-via-docker-goarch
+	GOARCH=arm $(MAKE) package-via-docker-goarch-nocgo
 
 package-via-docker-arm64:
-	GOARCH=arm64 $(MAKE) package-via-docker-goarch
+	GOARCH=arm64 $(MAKE) package-via-docker-goarch-nocgo
 
 package-via-docker-ppc64le:
-	GOARCH=ppc64le $(MAKE) package-via-docker-goarch
+	GOARCH=ppc64le $(MAKE) package-via-docker-goarch-nocgo
 
 package-via-docker-386:
-	GOARCH=386 $(MAKE) package-via-docker-goarch
+	GOARCH=386 $(MAKE) package-via-docker-goarch-nocgo
 
 remove-docker-images:
 	docker image ls --format '{{.Repository}}\t{{.ID}}' | grep $(DOCKER_NAMESPACE)/ | grep -v /builder | awk '{print $$2}' | xargs docker image rm -f