diff --git a/Dockerfile b/Dockerfile
index b1567c8..6d6f3f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN make build
 # RUN make test
 
 # Create production image for application with needed files
-FROM golang:1.19-alpine
+FROM iron/go
 
 EXPOSE 8000
 
diff --git a/Makefile b/Makefile
index 47149b2..34412f6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ PROJECT_NAME=$(shell basename $(CURDIR))
 
 ## build: build the application
 build:
-	export GO111MODULE="on"; \
+	export GO111MODULE="auto"; \
 	go mod download; \
 	go mod vendor; \
 	CGO_ENABLED=0 go build -a -ldflags '-s' -installsuffix cgo -o main cmd/server/main.go