diff --git a/.docker/Dockerfile.adm b/.docker/Dockerfile.adm
index 5801fbd80d..48ce659ce1 100644
--- a/.docker/Dockerfile.adm
+++ b/.docker/Dockerfile.adm
@@ -1,7 +1,4 @@
-FROM golang:1.16 as basebuilder
-RUN apk add --update make bash
-
-FROM basebuilder as builder
+FROM golang:1.16 as builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository
diff --git a/.docker/Dockerfile.cli b/.docker/Dockerfile.cli
index ad27b2b871..286b0ade07 100644
--- a/.docker/Dockerfile.cli
+++ b/.docker/Dockerfile.cli
@@ -1,7 +1,4 @@
-FROM golang:1.16 as basebuilder
-RUN apk add --update make bash
-
-FROM basebuilder as builder
+FROM golang:1.16 as builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository
diff --git a/.docker/Dockerfile.ir b/.docker/Dockerfile.ir
index 54f69309dc..ced828cc56 100644
--- a/.docker/Dockerfile.ir
+++ b/.docker/Dockerfile.ir
@@ -1,7 +1,4 @@
-FROM golang:1.16 as basebuilder
-RUN apk add --update make bash
-
-FROM basebuilder as builder
+FROM golang:1.16 as builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository
diff --git a/.docker/Dockerfile.storage b/.docker/Dockerfile.storage
index c52a32af7b..5e797886f1 100644
--- a/.docker/Dockerfile.storage
+++ b/.docker/Dockerfile.storage
@@ -1,7 +1,4 @@
-FROM golang:1.16 as basebuilder
-RUN apk add --update make bash
-
-FROM basebuilder as builder
+FROM golang:1.16 as builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository
diff --git a/.docker/Dockerfile.storage-testnet b/.docker/Dockerfile.storage-testnet
index 0d17711119..3dcf49488f 100644
--- a/.docker/Dockerfile.storage-testnet
+++ b/.docker/Dockerfile.storage-testnet
@@ -1,7 +1,4 @@
-FROM golang:1.16 as basebuilder
-RUN apk add --update make bash
-
-FROM basebuilder as builder
+FROM golang:1.16 as builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository