diff --git a/Dockerfile b/Dockerfile
index 9cb62e282..acf05b7fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,11 +16,11 @@ COPY go.mod go.sum ./
 RUN go mod download
 
 # Sources
-COPY cmd ./cmd
-COPY pkg ./pkg
+COPY cmd/epp ./cmd
+COPY pkg/epp ./pkg/epp
 COPY internal ./internal
 COPY api ./api
-WORKDIR /src/cmd/epp
+WORKDIR /src/cmd
 RUN go build -ldflags="-X sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics.CommitSHA=${COMMIT_SHA}" -o /epp
 
 ## Multistage deploy
diff --git a/bbr.Dockerfile b/bbr.Dockerfile
index 03024e497..8f21eeaaf 100644
--- a/bbr.Dockerfile
+++ b/bbr.Dockerfile
@@ -15,10 +15,10 @@ COPY go.mod go.sum ./
 RUN go mod download
 
 # Sources
-COPY cmd ./cmd
+COPY cmd/bbr ./cmd
 COPY pkg ./pkg
 COPY internal ./internal
-WORKDIR /src/cmd/bbr
+WORKDIR /src/cmd
 RUN go build -o /bbr
 
 ## Multistage deploy