diff --git a/Makefile b/Makefile
index bb7469d97..1d4260a33 100644
--- a/Makefile
+++ b/Makefile
@@ -88,34 +88,34 @@ vmutils-windows-amd64: \
 
 
 publish-release:
-	git checkout $(TAG) && $(MAKE) release publish && \
-		git checkout $(TAG)-cluster && $(MAKE) release publish && \
-		git checkout $(TAG)-enterprise && $(MAKE) release publish && \
-		git checkout $(TAG)-enterprise-cluster && $(MAKE) release publish
+	git checkout $(TAG) && $(MAKE) release copy-linux publish && \
+	git checkout $(TAG)-cluster && $(MAKE) release copy-linux-cluster publish && \
+	git checkout $(TAG)-enterprise && $(MAKE) release copy-linux-enterprise publish && \
+	git checkout $(TAG)-enterprise-cluster && $(MAKE) release copy-linux-enterprise-cluster publish
 
 release: \
 	release-victoria-metrics \
 	release-vmutils
 
 release-victoria-metrics: \
-	release-victoria-metrics-amd64 \
-	release-victoria-metrics-arm \
-	release-victoria-metrics-arm64 \
+	release-victoria-metrics-linux-amd64 \
+	release-victoria-metrics-linux-arm \
+	release-victoria-metrics-linux-arm64 \
 	release-victoria-metrics-darwin-amd64 \
 	release-victoria-metrics-darwin-arm64
 
-release-victoria-metrics-amd64:
-	OSARCH=amd64 $(MAKE) release-victoria-metrics-generic
-
-release-victoria-metrics-arm:
-	OSARCH=arm $(MAKE) release-victoria-metrics-generic
-
-release-victoria-metrics-arm64:
-	OSARCH=arm64 $(MAKE) release-victoria-metrics-generic
+release-victoria-metrics-linux-amd64:
+	OSARCH=linux-amd64 $(MAKE) release-victoria-metrics-generic
 
 release-victoria-metrics-darwin-amd64:
 	OSARCH=darwin-amd64 $(MAKE) release-victoria-metrics-generic
 
+release-victoria-metrics-linux-arm:
+	OSARCH=linux-arm $(MAKE) release-victoria-metrics-generic
+
+release-victoria-metrics-linux-arm64:
+	OSARCH=linux-arm64 $(MAKE) release-victoria-metrics-generic
+
 release-victoria-metrics-darwin-arm64:
 	OSARCH=darwin-arm64 $(MAKE) release-victoria-metrics-generic
 
@@ -128,31 +128,31 @@ release-victoria-metrics-generic: victoria-metrics-$(OSARCH)-prod
 			| sed s/-$(OSARCH)-prod/-prod/ > victoria-metrics-$(OSARCH)-$(PKG_TAG)_checksums.txt
 
 release-vmutils: \
-	release-vmutils-amd64 \
-	release-vmutils-arm64 \
-	release-vmutils-arm \
-	release-vmutils-darwin-amd64  \
+	release-vmutils-linux-amd64 \
+	release-vmutils-linux-arm \
+	release-vmutils-linux-arm64 \
+	release-vmutils-darwin-amd64 \
 	release-vmutils-darwin-arm64 \
 	release-vmutils-windows-amd64
 
-release-vmutils-amd64:
-	OSARCH=amd64 $(MAKE) release-vmutils-generic
-
-release-vmutils-arm64:
-	OSARCH=arm64 $(MAKE) release-vmutils-generic
-
-release-vmutils-arm:
-	OSARCH=arm $(MAKE) release-vmutils-generic
+release-vmutils-linux-amd64:
+	OSARCH=linux-amd64 $(MAKE) release-vmutils-generic
 
 release-vmutils-darwin-amd64:
 	OSARCH=darwin-amd64 $(MAKE) release-vmutils-generic
 
-release-vmutils-darwin-arm64:
-	OSARCH=darwin-arm64 $(MAKE) release-vmutils-generic
-
 release-vmutils-windows-amd64:
 	GOARCH=amd64 $(MAKE) release-vmutils-windows-generic
 
+release-vmutils-linux-arm:
+	OSARCH=linux-arm $(MAKE) release-vmutils-generic
+
+release-vmutils-linux-arm64:
+	OSARCH=linux-arm64 $(MAKE) release-vmutils-generic
+
+release-vmutils-darwin-arm64:
+	OSARCH=darwin-arm64 $(MAKE) release-vmutils-generic
+
 release-vmutils-generic: \
 	vmagent-$(OSARCH)-prod \
 	vmalert-$(OSARCH)-prod \
@@ -309,3 +309,40 @@ docs-sync:
 	SRC=app/vmctl/README.md DST=docs/vmctl.md ORDER=8 $(MAKE) copy-docs
 	SRC=app/vmgateway/README.md DST=docs/vmgateway.md ORDER=9 $(MAKE) copy-docs
 	SRC=app/vmbackupmanager/README.md DST=docs/vmbackupmanager.md ORDER=10 $(MAKE) copy-docs
+
+# temporary operation to maintain compatibility
+copy-linux:
+	cd bin && \
+		cp victoria-metrics-linux-amd64-$(PKG_TAG).tar.gz victoria-metrics-amd64-$(PKG_TAG).tar.gz && \
+		cp victoria-metrics-linux-arm-$(PKG_TAG).tar.gz victoria-metrics-arm-$(PKG_TAG).tar.gz && \
+		cp victoria-metrics-linux-arm64-$(PKG_TAG).tar.gz victoria-metrics-arm64-$(PKG_TAG).tar.gz && \
+		cp vmutils-linux-amd64-$(PKG_TAG).tar.gz vmutils-amd64-$(PKG_TAG).tar.gz && \
+		cp vmutils-linux-arm-$(PKG_TAG).tar.gz vmutils-arm-$(PKG_TAG).tar.gz && \
+		cp vmutils-linux-arm64-$(PKG_TAG).tar.gz vmutils-arm64-$(PKG_TAG).tar.gz
+
+copy-linux-cluster:
+	cd bin && \
+		cp victoria-metrics-linux-amd64-$(PKG_TAG)-cluster.tar.gz victoria-metrics-amd64-$(PKG_TAG)-cluster.tar.gz && \
+		cp victoria-metrics-linux-arm-$(PKG_TAG)-cluster.tar.gz victoria-metrics-arm-$(PKG_TAG)-cluster.tar.gz && \
+		cp victoria-metrics-linux-arm64-$(PKG_TAG)-cluster.tar.gz victoria-metrics-arm64-$(PKG_TAG)-cluster.tar.gz
+		cp vmutils-linux-amd64-$(PKG_TAG)-cluster.tar.gz vmutils-amd64-$(PKG_TAG)-cluster.tar.gz && \
+		cp vmutils-linux-arm-$(PKG_TAG)-cluster.tar.gz vmutils-arm-$(PKG_TAG)-cluster.tar.gz && \
+		cp vmutils-linux-arm64-$(PKG_TAG)-cluster.tar.gz vmutils-arm64-$(PKG_TAG)-cluster.tar.gz
+
+copy-linux-enterprise:
+	cd bin && \
+		cp victoria-metrics-linux-amd64-$(PKG_TAG)-enterprise.tar.gz victoria-metrics-amd64-$(PKG_TAG)-enterprise.tar.gz && \
+		cp victoria-metrics-linux-arm-$(PKG_TAG)-enterprise.tar.gz victoria-metrics-arm-$(PKG_TAG)-enterprise.tar.gz && \
+		cp victoria-metrics-linux-arm64-$(PKG_TAG)-enterprise.tar.gz victoria-metrics-arm64-$(PKG_TAG)-enterprise.tar.gz && \
+		cp vmutils-linux-amd64-$(PKG_TAG)-enterprise.tar.gz vmutils-amd64-$(PKG_TAG)-enterprise.tar.gz && \
+		cp vmutils-linux-arm-$(PKG_TAG)-enterprise.tar.gz vmutils-arm-$(PKG_TAG)-enterprise.tar.gz && \
+		cp vmutils-linux-arm64-$(PKG_TAG)-enterprise.tar.gz vmutils-arm64-$(PKG_TAG)-enterprise.tar.gz
+
+copy-linux-enterprise-cluster:
+	cd bin && \
+		cp victoria-metrics-linux-amd64-$(PKG_TAG)-enterprise-cluster.tar.gz victoria-metrics-amd64-$(PKG_TAG)-enterprise-cluster.tar.gz && \
+		cp victoria-metrics-linux-arm-$(PKG_TAG)-enterprise-cluster.tar.gz victoria-metrics-arm-$(PKG_TAG)-enterprise-cluster.tar.gz && \
+		cp victoria-metrics-linux-arm64-$(PKG_TAG)-enterprise-cluster.tar.gz victoria-metrics-arm64-$(PKG_TAG)-enterprise-cluster.tar.gz && \
+		cp vmutils-linux-amd64-$(PKG_TAG)-enterprise-cluster.tar.gz vmutils-amd64-$(PKG_TAG)-enterprise-cluster.tar.gz && \
+		cp vmutils-linux-arm-$(PKG_TAG)-enterprise-cluster.tar.gz vmutils-arm-$(PKG_TAG)-enterprise-cluster.tar.gz && \
+		cp vmutils-linux-arm64-$(PKG_TAG)-enterprise-cluster.tar.gz vmutils-arm64-$(PKG_TAG)-enterprise-cluster.tar.gz
diff --git a/app/victoria-metrics/Makefile b/app/victoria-metrics/Makefile
index bb97674c7..fd8e4ae0d 100644
--- a/app/victoria-metrics/Makefile
+++ b/app/victoria-metrics/Makefile
@@ -1,5 +1,6 @@
 # All these commands must run from repository root.
 
+# Application build
 victoria-metrics:
 	APP_NAME=victoria-metrics $(MAKE) app-local
 
@@ -12,27 +13,42 @@ victoria-metrics-prod:
 victoria-metrics-pure-prod:
 	APP_NAME=victoria-metrics $(MAKE) app-via-docker-pure
 
+# GOARCH=amd64
 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
-
-victoria-metrics-arm64-prod:
-	APP_NAME=victoria-metrics $(MAKE) app-via-docker-arm64
-
-victoria-metrics-ppc64le-prod:
-	APP_NAME=victoria-metrics $(MAKE) app-via-docker-ppc64le
-
-victoria-metrics-386-prod:
-	APP_NAME=victoria-metrics $(MAKE) app-via-docker-386
+victoria-metrics-linux-amd64-prod:
+	APP_NAME=victoria-metrics $(MAKE) app-via-docker-linux-amd64
 
 victoria-metrics-darwin-amd64-prod:
 	APP_NAME=victoria-metrics $(MAKE) app-via-docker-darwin-amd64
 
+# GOARCH=arm64
+victoria-metrics-arm64-prod:
+	APP_NAME=victoria-metrics $(MAKE) app-via-docker-arm64
+
+victoria-metrics-linux-arm64-prod:
+	APP_NAME=victoria-metrics $(MAKE) app-via-docker-linux-arm64
+
 victoria-metrics-darwin-arm64-prod:
 	APP_NAME=victoria-metrics $(MAKE) app-via-docker-darwin-arm64
 
+# GOARCH=arm
+victoria-metrics-arm-prod:
+	APP_NAME=victoria-metrics $(MAKE) app-via-docker-arm
+
+victoria-metrics-linux-arm-prod:
+	APP_NAME=victoria-metrics $(MAKE) app-via-docker-linux-arm
+
+# GOARCH=ppc64le
+victoria-metrics-ppc64le-prod:
+	APP_NAME=victoria-metrics $(MAKE) app-via-docker-ppc64le
+
+# GOARCH=386
+victoria-metrics-386-prod:
+	APP_NAME=victoria-metrics $(MAKE) app-via-docker-386
+
+# Package build
 package-victoria-metrics:
 	APP_NAME=victoria-metrics $(MAKE) package-via-docker
 
diff --git a/app/vmagent/Makefile b/app/vmagent/Makefile
index 55785189e..8a7bd2f34 100644
--- a/app/vmagent/Makefile
+++ b/app/vmagent/Makefile
@@ -1,5 +1,6 @@
 # All these commands must run from repository root.
 
+# Application build
 vmagent:
 	APP_NAME=vmagent $(MAKE) app-local
 
@@ -12,30 +13,36 @@ vmagent-prod:
 vmagent-pure-prod:
 	APP_NAME=vmagent $(MAKE) app-via-docker-pure
 
-vmagent-amd64-prod:
-	APP_NAME=vmagent $(MAKE) app-via-docker-amd64
+# GOOS=linux
+vmagent-linux-amd64-prod:
+	APP_NAME=vmagent $(MAKE) app-via-docker-linux-amd64
 
-vmagent-arm-prod:
-	APP_NAME=vmagent $(MAKE) app-via-docker-arm
+vmagent-linux-arm64-prod:
+	APP_NAME=vmagent $(MAKE) app-via-docker-linux-arm64
 
-vmagent-arm64-prod:
-	APP_NAME=vmagent $(MAKE) app-via-docker-arm64
-
-vmagent-ppc64le-prod:
-	APP_NAME=vmagent $(MAKE) app-via-docker-ppc64le
-
-vmagent-386-prod:
-	APP_NAME=vmagent $(MAKE) app-via-docker-386
+vmagent-linux-arm-prod:
+	APP_NAME=vmagent $(MAKE) app-via-docker-linux-arm
 
+#GOOS=darwin
 vmagent-darwin-amd64-prod:
 	APP_NAME=vmagent $(MAKE) app-via-docker-darwin-amd64
 
 vmagent-darwin-arm64-prod:
 	APP_NAME=vmagent $(MAKE) app-via-docker-darwin-arm64
 
+#GOOS=windows
 vmagent-windows-amd64-prod:
 	APP_NAME=vmagent $(MAKE) app-via-docker-windows-amd64
 
+# GOARCH=ppc64le
+vmagent-ppc64le-prod:
+	APP_NAME=vmagent $(MAKE) app-via-docker-ppc64le
+
+# GOARCH=386
+vmagent-386-prod:
+	APP_NAME=vmagent $(MAKE) app-via-docker-386
+
+# Package build
 package-vmagent:
 	APP_NAME=vmagent $(MAKE) package-via-docker
 
diff --git a/app/vmagent/README.md b/app/vmagent/README.md
index 50d63b29e..fbbf67956 100644
--- a/app/vmagent/README.md
+++ b/app/vmagent/README.md
@@ -823,8 +823,8 @@ ARM build may run on Raspberry Pi or on [energy-efficient ARM servers](https://b
 ### Production ARM build
 
 1. [Install docker](https://docs.docker.com/install/).
-2. Run `make vmagent-arm-prod` or `make vmagent-arm64-prod` from the root folder of [the repository](https://github.com/VictoriaMetrics/VictoriaMetrics).
-   It builds `vmagent-arm-prod` or `vmagent-arm64-prod` binary respectively and puts it into the `bin` folder.
+2. Run `make vmagent-linux-arm-prod` or `make vmagent-linux-arm64-prod` from the root folder of [the repository](https://github.com/VictoriaMetrics/VictoriaMetrics).
+   It builds `vmagent-linux-arm-prod` or `vmagent-linux-arm64-prod` binary respectively and puts it into the `bin` folder.
 
 ## Profiling
 
diff --git a/app/vmalert/Makefile b/app/vmalert/Makefile
index e4ed5d128..928a5dbe2 100644
--- a/app/vmalert/Makefile
+++ b/app/vmalert/Makefile
@@ -1,5 +1,6 @@
 # All these commands must run from repository root.
 
+# Application build
 vmalert:
 	APP_NAME=vmalert $(MAKE) app-local
 
@@ -12,30 +13,36 @@ vmalert-prod:
 vmalert-pure-prod:
 	APP_NAME=vmalert $(MAKE) app-via-docker-pure
 
-vmalert-amd64-prod:
-	APP_NAME=vmalert $(MAKE) app-via-docker-amd64
+# GOOS=linux
+vmalert-linux-amd64-prod:
+	APP_NAME=vmalert $(MAKE) app-via-docker-linux-amd64
 
-vmalert-arm-prod:
-	APP_NAME=vmalert $(MAKE) app-via-docker-arm
+vmalert-linux-arm64-prod:
+	APP_NAME=vmalert $(MAKE) app-via-docker-linux-arm64
 
-vmalert-arm64-prod:
-	APP_NAME=vmalert $(MAKE) app-via-docker-arm64
-
-vmalert-ppc64le-prod:
-	APP_NAME=vmalert $(MAKE) app-via-docker-ppc64le
-
-vmalert-386-prod:
-	APP_NAME=vmalert $(MAKE) app-via-docker-386
+vmalert-linux-arm-prod:
+	APP_NAME=vmalert $(MAKE) app-via-docker-linux-arm
 
+# GOOS=darwin
 vmalert-darwin-amd64-prod:
 	APP_NAME=vmalert $(MAKE) app-via-docker-darwin-amd64
 
 vmalert-darwin-arm64-prod:
 	APP_NAME=vmalert $(MAKE) app-via-docker-darwin-arm64
 
+# GOOS=windows
 vmalert-windows-amd64-prod:
 	APP_NAME=vmalert $(MAKE) app-via-docker-windows-amd64
 
+# GOARCH=ppc64le
+vmalert-ppc64le-prod:
+	APP_NAME=vmalert $(MAKE) app-via-docker-ppc64le
+
+# GOARCH=386
+vmalert-386-prod:
+	APP_NAME=vmalert $(MAKE) app-via-docker-386
+
+# Package build
 package-vmalert:
 	APP_NAME=vmalert $(MAKE) package-via-docker
 
diff --git a/app/vmalert/README.md b/app/vmalert/README.md
index 56722c72d..ac0b2e47b 100644
--- a/app/vmalert/README.md
+++ b/app/vmalert/README.md
@@ -1114,5 +1114,5 @@ ARM build may run on Raspberry Pi or on [energy-efficient ARM servers](https://b
 ### Production ARM build
 
 1. [Install docker](https://docs.docker.com/install/).
-2. Run `make vmalert-arm-prod` or `make vmalert-arm64-prod` from the root folder of [the repository](https://github.com/VictoriaMetrics/VictoriaMetrics).
-   It builds `vmalert-arm-prod` or `vmalert-arm64-prod` binary respectively and puts it into the `bin` folder.
+2. Run `make vmalert-linux-arm-prod` or `make vmalert-linux-arm64-prod` from the root folder of [the repository](https://github.com/VictoriaMetrics/VictoriaMetrics).
+   It builds `vmalert-linux-arm-prod` or `vmalert-linux-arm64-prod` binary respectively and puts it into the `bin` folder.
diff --git a/app/vmauth/Makefile b/app/vmauth/Makefile
index 93f4504fc..dc4f72ea8 100644
--- a/app/vmauth/Makefile
+++ b/app/vmauth/Makefile
@@ -1,5 +1,6 @@
 # All these commands must run from repository root.
 
+# Application build
 vmauth:
 	APP_NAME=vmauth $(MAKE) app-local
 
@@ -12,30 +13,36 @@ vmauth-prod:
 vmauth-pure-prod:
 	APP_NAME=vmauth $(MAKE) app-via-docker-pure
 
-vmauth-amd64-prod:
-	APP_NAME=vmauth $(MAKE) app-via-docker-amd64
+# GOOS=linux
+vmauth-linux-amd64-prod:
+	APP_NAME=vmauth $(MAKE) app-via-docker-linux-amd64
 
-vmauth-arm-prod:
-	APP_NAME=vmauth $(MAKE) app-via-docker-arm
+vmauth-linux-arm64-prod:
+	APP_NAME=vmauth $(MAKE) app-via-docker-linux-arm64
 
-vmauth-arm64-prod:
-	APP_NAME=vmauth $(MAKE) app-via-docker-arm64
-
-vmauth-ppc64le-prod:
-	APP_NAME=vmauth $(MAKE) app-via-docker-ppc64le
-
-vmauth-386-prod:
-	APP_NAME=vmauth $(MAKE) app-via-docker-386
+vmauth-linux-arm-prod:
+	APP_NAME=vmauth $(MAKE) app-via-docker-linux-arm
 
+# GOOS=darwin
 vmauth-darwin-amd64-prod:
 	APP_NAME=vmauth $(MAKE) app-via-docker-darwin-amd64
 
 vmauth-darwin-arm64-prod:
 	APP_NAME=vmauth $(MAKE) app-via-docker-darwin-arm64
 
+# GOOS=windows
 vmauth-windows-amd64-prod:
 	APP_NAME=vmauth $(MAKE) app-via-docker-windows-amd64
 
+# GOARCH=ppc64le
+vmauth-ppc64le-prod:
+	APP_NAME=vmauth $(MAKE) app-via-docker-ppc64le
+
+# GOARCH=386
+vmauth-386-prod:
+	APP_NAME=vmauth $(MAKE) app-via-docker-386
+
+# Package build
 package-vmauth:
 	APP_NAME=vmauth $(MAKE) package-via-docker
 
diff --git a/app/vmbackup/Makefile b/app/vmbackup/Makefile
index 4e72b0fad..6dca898c9 100644
--- a/app/vmbackup/Makefile
+++ b/app/vmbackup/Makefile
@@ -1,5 +1,6 @@
 # All these commands must run from repository root.
 
+# Application build
 vmbackup:
 	APP_NAME=vmbackup $(MAKE) app-local
 
@@ -12,27 +13,32 @@ vmbackup-prod:
 vmbackup-pure-prod:
 	APP_NAME=vmbackup $(MAKE) app-via-docker-pure
 
-vmbackup-amd64-prod:
-	APP_NAME=vmbackup $(MAKE) app-via-docker-amd64
+# GOOS=linux
+vmbackup-linux-amd64-prod:
+	APP_NAME=vmbackup $(MAKE) app-via-docker-linux-amd64
 
-vmbackup-arm-prod:
-	APP_NAME=vmbackup $(MAKE) app-via-docker-arm
+vmbackup-linux-arm64-prod:
+	APP_NAME=vmbackup $(MAKE) app-via-docker-linux-arm64
 
-vmbackup-arm64-prod:
-	APP_NAME=vmbackup $(MAKE) app-via-docker-arm64
-
-vmbackup-ppc64le-prod:
-	APP_NAME=vmbackup $(MAKE) app-via-docker-ppc64le
-
-vmbackup-386-prod:
-	APP_NAME=vmbackup $(MAKE) app-via-docker-386
+vmbackup-linux-arm-prod:
+	APP_NAME=vmbackup $(MAKE) app-via-docker-linux-arm
 
+# GOOS=darwin
 vmbackup-darwin-amd64-prod:
 	APP_NAME=vmbackup $(MAKE) app-via-docker-darwin-amd64
 
 vmbackup-darwin-arm64-prod:
 	APP_NAME=vmbackup $(MAKE) app-via-docker-darwin-arm64
 
+# GOARCH=ppc64le
+vmbackup-ppc64le-prod:
+	APP_NAME=vmbackup $(MAKE) app-via-docker-ppc64le
+
+# GOARCH=386
+vmbackup-386-prod:
+	APP_NAME=vmbackup $(MAKE) app-via-docker-386
+
+# Package build
 package-vmbackup:
 	APP_NAME=vmbackup $(MAKE) package-via-docker
 
diff --git a/app/vmctl/Makefile b/app/vmctl/Makefile
index d9c604fd6..33475df24 100644
--- a/app/vmctl/Makefile
+++ b/app/vmctl/Makefile
@@ -1,5 +1,6 @@
 # All these commands must run from repository root.
 
+# Application build
 vmctl:
 	APP_NAME=vmctl $(MAKE) app-local
 
@@ -12,30 +13,36 @@ vmctl-prod:
 vmctl-pure-prod:
 	APP_NAME=vmctl $(MAKE) app-via-docker-pure
 
-vmctl-amd64-prod:
-	APP_NAME=vmctl $(MAKE) app-via-docker-amd64
+# GOOS=linux
+vmctl-linux-amd64-prod:
+	APP_NAME=vmctl $(MAKE) app-via-docker-linux-amd64
 
-vmctl-arm-prod:
-	APP_NAME=vmctl $(MAKE) app-via-docker-arm
+vmctl-linux-arm64-prod:
+	APP_NAME=vmctl $(MAKE) app-via-docker-linux-arm64
 
-vmctl-arm64-prod:
-	APP_NAME=vmctl $(MAKE) app-via-docker-arm64
-
-vmctl-ppc64le-prod:
-	APP_NAME=vmctl $(MAKE) app-via-docker-ppc64le
-
-vmctl-386-prod:
-	APP_NAME=vmctl $(MAKE) app-via-docker-386
+vmctl-linux-arm-prod:
+	APP_NAME=vmctl $(MAKE) app-via-docker-linux-arm
 
+# GOOS=darwin
 vmctl-darwin-amd64-prod:
 	APP_NAME=vmctl $(MAKE) app-via-docker-darwin-amd64
 
 vmctl-darwin-arm64-prod:
 	APP_NAME=vmctl $(MAKE) app-via-docker-darwin-arm64
 
+# GOOS=window
 vmctl-windows-amd64-prod:
 	APP_NAME=vmctl $(MAKE) app-via-docker-windows-amd64
 
+# GOARCH=ppc64le
+vmctl-ppc64le-prod:
+	APP_NAME=vmctl $(MAKE) app-via-docker-ppc64le
+
+# GOARCH=386
+vmctl-386-prod:
+	APP_NAME=vmctl $(MAKE) app-via-docker-386
+
+# Package build
 package-vmctl:
 	APP_NAME=vmctl $(MAKE) package-via-docker
 
diff --git a/app/vmctl/README.md b/app/vmctl/README.md
index 8488f0cc1..63ea083ee 100644
--- a/app/vmctl/README.md
+++ b/app/vmctl/README.md
@@ -667,5 +667,5 @@ ARM build may run on Raspberry Pi or on [energy-efficient ARM servers](https://b
 #### Production ARM build
 
 1. [Install docker](https://docs.docker.com/install/).
-2. Run `make vmctl-arm-prod` or `make vmctl-arm64-prod` from the root folder of [the repository](https://github.com/VictoriaMetrics/VictoriaMetrics).
-   It builds `vmctl-arm-prod` or `vmctl-arm64-prod` binary respectively and puts it into the `bin` folder.
+2. Run `make vmctl-linux-arm-prod` or `make vmctl-linux-arm64-prod` from the root folder of [the repository](https://github.com/VictoriaMetrics/VictoriaMetrics).
+   It builds `vmctl-linux-arm-prod` or `vmctl-linux-arm64-prod` binary respectively and puts it into the `bin` folder.
diff --git a/app/vmrestore/Makefile b/app/vmrestore/Makefile
index 48e5c9281..e6f6f424a 100644
--- a/app/vmrestore/Makefile
+++ b/app/vmrestore/Makefile
@@ -1,5 +1,6 @@
 # All these commands must run from repository root.
 
+# Application build
 vmrestore:
 	APP_NAME=vmrestore $(MAKE) app-local
 
@@ -12,27 +13,32 @@ vmrestore-prod:
 vmrestore-pure-prod:
 	APP_NAME=vmrestore $(MAKE) app-via-docker-pure
 
-vmrestore-amd64-prod:
-	APP_NAME=vmrestore $(MAKE) app-via-docker-amd64
+# GOOS=linux
+vmrestore-linux-amd64-prod:
+	APP_NAME=vmrestore $(MAKE) app-via-docker-linux-amd64
 
-vmrestore-arm-prod:
-	APP_NAME=vmrestore $(MAKE) app-via-docker-arm
+vmrestore-linux-arm64-prod:
+	APP_NAME=vmrestore $(MAKE) app-via-docker-linux-arm64
 
-vmrestore-arm64-prod:
-	APP_NAME=vmrestore $(MAKE) app-via-docker-arm64
-
-vmrestore-ppc64le-prod:
-	APP_NAME=vmrestore $(MAKE) app-via-docker-ppc64le
-
-vmrestore-386-prod:
-	APP_NAME=vmrestore $(MAKE) app-via-docker-386
+vmrestore-linux-arm-prod:
+	APP_NAME=vmrestore $(MAKE) app-via-docker-linux-arm
 
+# GOOS=darwin
 vmrestore-darwin-amd64-prod:
 	APP_NAME=vmrestore $(MAKE) app-via-docker-darwin-amd64
 
 vmrestore-darwin-arm64-prod:
 	APP_NAME=vmrestore $(MAKE) app-via-docker-darwin-arm64
 
+# GOARCH=ppc64le
+vmrestore-ppc64le-prod:
+	APP_NAME=vmrestore $(MAKE) app-via-docker-ppc64le
+
+# GOARCH=386
+vmrestore-386-prod:
+	APP_NAME=vmrestore $(MAKE) app-via-docker-386
+
+# Package build
 package-vmrestore:
 	APP_NAME=vmrestore $(MAKE) package-via-docker
 
diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile
index 6d4648ea3..a154e87ee 100644
--- a/deployment/docker/Makefile
+++ b/deployment/docker/Makefile
@@ -66,8 +66,13 @@ package-via-docker: package-base
 
 publish-via-docker: \
 	app-via-docker-amd64 \
+	app-via-docker-linux-amd64 \
+	app-via-docker-darwin-amd64 \
 	app-via-docker-arm \
+	app-via-docker-linux-arm \
 	app-via-docker-arm64 \
+	app-via-docker-linux-arm64 \
+	app-via-docker-darwin-arm64 \
 	app-via-docker-ppc64le \
 	app-via-docker-386
 	docker buildx build \
@@ -100,6 +105,15 @@ app-via-docker-darwin-amd64:
 app-via-docker-darwin-arm64:
 	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 $(MAKE) app-via-docker-goos-goarch
 
+app-via-docker-linux-amd64:
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(MAKE) app-via-docker-goos-goarch
+
+app-via-docker-linux-arm64:
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 $(MAKE) app-via-docker-goos-goarch
+
+app-via-docker-linux-arm:
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm $(MAKE) app-via-docker-goos-goarch
+
 app-via-docker-goos-goarch:
 	APP_SUFFIX='-$(GOOS)-$(GOARCH)' \
 	DOCKER_OPTS='--env CGO_ENABLED=$(CGO_ENABLED) --env GOOS=$(GOOS) --env GOARCH=$(GOARCH)' \
diff --git a/docs/vmagent.md b/docs/vmagent.md
index ad73d42d8..2c21f76c5 100644
--- a/docs/vmagent.md
+++ b/docs/vmagent.md
@@ -827,8 +827,8 @@ ARM build may run on Raspberry Pi or on [energy-efficient ARM servers](https://b
 ### Production ARM build
 
 1. [Install docker](https://docs.docker.com/install/).
-2. Run `make vmagent-arm-prod` or `make vmagent-arm64-prod` from the root folder of [the repository](https://github.com/VictoriaMetrics/VictoriaMetrics).
-   It builds `vmagent-arm-prod` or `vmagent-arm64-prod` binary respectively and puts it into the `bin` folder.
+2. Run `make vmagent-linux-arm-prod` or `make vmagent-linux-arm64-prod` from the root folder of [the repository](https://github.com/VictoriaMetrics/VictoriaMetrics).
+   It builds `vmagent-linux-arm-prod` or `vmagent-linux-arm64-prod` binary respectively and puts it into the `bin` folder.
 
 ## Profiling
 
diff --git a/docs/vmalert.md b/docs/vmalert.md
index 0da33a649..1f0c33c2d 100644
--- a/docs/vmalert.md
+++ b/docs/vmalert.md
@@ -1118,5 +1118,5 @@ ARM build may run on Raspberry Pi or on [energy-efficient ARM servers](https://b
 ### Production ARM build
 
 1. [Install docker](https://docs.docker.com/install/).
-2. Run `make vmalert-arm-prod` or `make vmalert-arm64-prod` from the root folder of [the repository](https://github.com/VictoriaMetrics/VictoriaMetrics).
-   It builds `vmalert-arm-prod` or `vmalert-arm64-prod` binary respectively and puts it into the `bin` folder.
+2. Run `make vmalert-linux-arm-prod` or `make vmalert-arm64-prod` from the root folder of [the repository](https://github.com/VictoriaMetrics/VictoriaMetrics).
+   It builds `vmalert-linux-arm-prod` or `vmalert-arm64-prod` binary respectively and puts it into the `bin` folder.
diff --git a/docs/vmctl.md b/docs/vmctl.md
index 0960bcb3f..42f645dc1 100644
--- a/docs/vmctl.md
+++ b/docs/vmctl.md
@@ -20,7 +20,7 @@ To see the full list of supported modes
 run the following command:
 
 ```console
-$ ./vmctl --help                                        
+$ ./vmctl --help
 NAME:
    vmctl - VictoriaMetrics command-line tool
 
@@ -44,9 +44,9 @@ OPTIONS:
    --influx-addr value              InfluxDB server addr (default: "http://localhost:8086")
    --influx-user value              InfluxDB user [$INFLUX_USERNAME]
 ...
-   --vm-addr vmctl                             VictoriaMetrics address to perform import requests. 
-Should be the same as --httpListenAddr value for single-node version or vminsert component. 
-When importing into the clustered version do not forget to set additionally --vm-account-id flag. 
+   --vm-addr vmctl                             VictoriaMetrics address to perform import requests.
+Should be the same as --httpListenAddr value for single-node version or vminsert component.
+When importing into the clustered version do not forget to set additionally --vm-account-id flag.
 Please note, that vmctl performs initial readiness check for the given address by checking `/health` endpoint. (default: "http://localhost:8428")
    --vm-user value        VictoriaMetrics username for basic auth [$VM_USERNAME]
    --vm-password value    VictoriaMetrics password for basic auth [$VM_PASSWORD]
@@ -111,7 +111,7 @@ $ ./vmctl opentsdb --otsdb-addr http://opentsdb:4242/ --otsdb-retentions sum-1m-
 OpenTSDB import mode
 2021/04/09 11:52:50 Will collect data starting at TS 1617990770
 2021/04/09 11:52:50 Loading all metrics from OpenTSDB for filters:  [system]
-Found 9 metrics to import. Continue? [Y/n] 
+Found 9 metrics to import. Continue? [Y/n]
 2021/04/09 11:52:51 Starting work on system.load1
 23 / 402200 [>____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________] 0.01% 2 p/s
 ```
@@ -284,7 +284,7 @@ InfluxDB import mode
 2020/01/26 14:23:29 fetching fields: command: "show field keys"; database: "benchmark"; retention: "autogen"
 2020/01/26 14:23:29 found 12 fields
 2020/01/26 14:23:29 fetching series: command: "show series on benchmark from cpu where hostname='host_1703'"; database: "benchmark"; retention: "autogen"
-Found 10 timeseries to import. Continue? [Y/n] 
+Found 10 timeseries to import. Continue? [Y/n]
 ```
 
 The timeseries select query would be following:
@@ -503,10 +503,10 @@ processed and can't show the progress bar. It will show the current processing s
   --vm-native-filter-match='{job="vmagent"}' \
   --vm-native-filter-time-start='2020-01-01T20:07:00Z'
 VictoriaMetrics Native import mode
-Initing export pipe from "http://localhost:8528" with filters: 
+Initing export pipe from "http://localhost:8528" with filters:
         filter: match[]={job="vmagent"}
 Initing import process to "http://localhost:8428":
-Total: 336.75 KiB ↖ Speed: 454.46 KiB p/s                                                                                                               
+Total: 336.75 KiB ↖ Speed: 454.46 KiB p/s
 2020/10/13 17:04:59 Total time: 952.143376ms
 ```
 
@@ -528,7 +528,7 @@ and specify `accountID` param.
 
 ## Verifying exported blocks from VictoriaMetrics
 
-In this mode, `vmctl` allows verifying correctness and integrity of data exported via [native format](https://docs.victoriametrics.com/Single-server-VictoriaMetrics.html#how-to-export-data-in-native-format) from VictoriaMetrics. 
+In this mode, `vmctl` allows verifying correctness and integrity of data exported via [native format](https://docs.victoriametrics.com/Single-server-VictoriaMetrics.html#how-to-export-data-in-native-format) from VictoriaMetrics.
 You can verify exported data at disk before uploading it by `vmctl verify-block` command:
 
 ```console
@@ -671,5 +671,5 @@ ARM build may run on Raspberry Pi or on [energy-efficient ARM servers](https://b
 #### Production ARM build
 
 1. [Install docker](https://docs.docker.com/install/).
-2. Run `make vmctl-arm-prod` or `make vmctl-arm64-prod` from the root folder of [the repository](https://github.com/VictoriaMetrics/VictoriaMetrics).
-   It builds `vmctl-arm-prod` or `vmctl-arm64-prod` binary respectively and puts it into the `bin` folder.
+2. Run `make vmctl-linux-arm-prod` or `make vmctl-linux-arm64-prod` from the root folder of [the repository](https://github.com/VictoriaMetrics/VictoriaMetrics).
+   It builds `vmctl-linux-arm-prod` or `vmctl-linux-arm64-prod` binary respectively and puts it into the `bin` folder.