diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile
index 046eeb14c..a7f3a0fdf 100644
--- a/deployment/docker/Makefile
+++ b/deployment/docker/Makefile
@@ -4,7 +4,7 @@ DOCKER_NAMESPACE := victoriametrics
 
 ROOT_IMAGE ?= alpine:3.15.0
 CERTS_IMAGE := alpine:3.15.0
-GO_BUILDER_IMAGE := golang:1.17.7-alpine
+GO_BUILDER_IMAGE := golang:1.18.0-alpine
 BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr :/ __)-1
 BASE_IMAGE := local/base:1.1.3-$(shell echo $(ROOT_IMAGE) | tr :/ __)-$(shell echo $(CERTS_IMAGE) | tr :/ __)
 
@@ -186,4 +186,4 @@ package-via-docker-386:
 	GOARCH=386 $(MAKE) package-via-docker-goarch-nocgo
 
 remove-docker-images:
-	docker image ls --format '{{.Repository}}\t{{.ID}}' | grep $(DOCKER_NAMESPACE)/ | awk '{print $$2}' | xargs docker image rm -f
+	docker image ls --format '{{.Repository}}\t{{.ID}}' | awk '{print $$2}' | xargs docker image rm -f
diff --git a/deployment/docker/builder/Dockerfile b/deployment/docker/builder/Dockerfile
index c718d6ced..e18295133 100644
--- a/deployment/docker/builder/Dockerfile
+++ b/deployment/docker/builder/Dockerfile
@@ -1,9 +1,9 @@
 ARG go_builder_image
 FROM $go_builder_image
 STOPSIGNAL SIGINT
-RUN apk add gcc musl-dev make wget --no-cache && \
+RUN apk add git gcc musl-dev make wget --no-cache && \
     mkdir /opt/cross-builder && \
     wget https://musl.cc/aarch64-linux-musl-cross.tgz -O /opt/cross-builder/aarch64-musl.tgz && \
     cd /opt/cross-builder && \
     tar zxf aarch64-musl.tgz -C ./  && \
-    rm /opt/cross-builder/aarch64-musl.tgz
\ No newline at end of file
+    rm /opt/cross-builder/aarch64-musl.tgz