diff --git a/Dockerfile b/Dockerfile
index a9d36efc..8da447e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,10 +44,7 @@ RUN  --mount=type=cache,target=/root/.local/share/golang \
      go mod download
 
 # Copy the sources
-COPY main.go main.go
-COPY api/ api/
-COPY ipam/ ipam/
-COPY controllers/ controllers/
+COPY . .
 
 # Build
 ARG ARCH
@@ -56,9 +53,9 @@ RUN  --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/root/.local/share/golang \
     if [ ${CRYPTO_LIB} ];\
      then \
-        GOARCH=${ARCH} go-build-fips.sh -a -o manager . ;\
+        GOARCH=${ARCH} go-build-fips.sh -a -o manager github.com/metal3-io/ip-address-manager ;\
      else \
-        GOARCH=${ARCH} go-build-static.sh -a -o manager . ;\
+        GOARCH=${ARCH} go-build-static.sh -a -o manager github.com/metal3-io/ip-address-manager ;\
      fi
 
 RUN if [ "${CRYPTO_LIB}" ]; then assert-static.sh manager; fi
diff --git a/Makefile b/Makefile
index bd19b1b7..f27d3730 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ SHELL:=/usr/bin/env bash
 .DEFAULT_GOAL:=help
 # Fips Flags
 FIPS_ENABLE ?= ""
-BUILDER_GOLANG_VERSION ?= 1.21
+BUILDER_GOLANG_VERSION ?= 1.21.6
 BUILD_ARGS = --build-arg CRYPTO_LIB=${FIPS_ENABLE} --build-arg BUILDER_GOLANG_VERSION=${BUILDER_GOLANG_VERSION}
 
 RELEASE_LOC := release