diff --git a/build/forklift-api/Containerfile b/build/forklift-api/Containerfile
index f83c25307..a18bdd116 100644
--- a/build/forklift-api/Containerfile
+++ b/build/forklift-api/Containerfile
@@ -3,7 +3,7 @@ WORKDIR /app
 COPY --chown=1001:0 ./ ./
 ENV GOFLAGS "-mod=vendor -tags=strictfipsruntime"
 ENV GOEXPERIMENT strictfipsruntime
-RUN GOOS=linux GOARCH=amd64 go build -buildvcs=false -ldflags="-w -s" -o forklift-api github.com/konveyor/forklift-controller/pkg/forklift-api
+RUN GOOS=linux GOARCH=amd64 go build -buildvcs=false -ldflags="-w -s" -o forklift-api ./cmd/forklift-api/forklift-api.go
 
 FROM registry.access.redhat.com/ubi9-minimal:9.4-1227.1725849298
 # Required to be able to get files from within the pod
diff --git a/build/forklift-controller/Containerfile b/build/forklift-controller/Containerfile
index 3badc59e5..cf9bedd88 100644
--- a/build/forklift-controller/Containerfile
+++ b/build/forklift-controller/Containerfile
@@ -3,7 +3,7 @@ WORKDIR /app
 COPY --chown=1001:0 ./ ./
 ENV GOFLAGS "-mod=vendor -tags=strictfipsruntime"
 ENV GOEXPERIMENT strictfipsruntime
-RUN GOOS=linux GOARCH=amd64 go build -buildvcs=false -ldflags="-w -s" -o manager github.com/konveyor/forklift-controller/cmd/forklift-controller
+RUN GOOS=linux GOARCH=amd64 go build -buildvcs=false -ldflags="-w -s" -o manager ./cmd/forklift-controller/main.go
 
 FROM registry.access.redhat.com/ubi9-minimal:9.4-1227.1725849298
 # RUN microdnf -y update && microdnf -y clean all
diff --git a/build/openstack-populator/Containerfile b/build/openstack-populator/Containerfile
index 5c7d5f9f0..9c2103f6f 100644
--- a/build/openstack-populator/Containerfile
+++ b/build/openstack-populator/Containerfile
@@ -3,7 +3,7 @@ WORKDIR /app
 COPY --chown=1001:0 ./ ./
 ENV GOFLAGS "-mod=vendor -tags=strictfipsruntime"
 ENV GOEXPERIMENT strictfipsruntime
-RUN GOOS=linux GOARCH=amd64 go build -buildvcs=false -ldflags="-w -s" -o openstack-populator github.com/konveyor/forklift-controller/cmd/openstack-populator
+RUN GOOS=linux GOARCH=amd64 go build -buildvcs=false -ldflags="-w -s" -o openstack-populator ./cmd/openstack-populator/openstack-populator.go
 
 FROM registry.access.redhat.com/ubi9-minimal:9.4-1227.1725849298
 # Required to be able to get files from within the pod
diff --git a/build/ova-provider-server/Containerfile b/build/ova-provider-server/Containerfile
index cc8a74724..536424424 100644
--- a/build/ova-provider-server/Containerfile
+++ b/build/ova-provider-server/Containerfile
@@ -4,7 +4,7 @@ COPY --chown=1001:0 ./ ./
 ENV GOFLAGS "-mod=vendor -tags=strictfipsruntime"
 ENV GOEXPERIMENT strictfipsruntime
 
-RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o ova-provider-server github.com/konveyor/forklift-controller/cmd/ova-provider-server
+RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o ova-provider-server ./cmd/ova-provider-server/ova-provider-server.go
 
 FROM registry.access.redhat.com/ubi9-minimal:9.4-1227.1725849298
 # Required to be able to get files from within the pod
diff --git a/build/ovirt-populator/Containerfile b/build/ovirt-populator/Containerfile
index 3b389df77..594e90dde 100644
--- a/build/ovirt-populator/Containerfile
+++ b/build/ovirt-populator/Containerfile
@@ -5,7 +5,7 @@ COPY --chown=1001:0 ./ ./
 ENV GOFLAGS "-mod=vendor -tags=strictfipsruntime"
 ENV GOEXPERIMENT strictfipsruntime
 
-RUN GOOS=linux GOARCH=amd64 go build -o ovirt-populator github.com/konveyor/forklift-controller/cmd/ovirt-populator
+RUN GOOS=linux GOARCH=amd64 go build -o ovirt-populator ./cmd/ovirt-populator/ovirt-populator.go
 
 FROM registry.access.redhat.com/ubi8-minimal:8.10-1052.1724178568
 COPY --from=builder /app/ovirt-populator /usr/local/bin/ovirt-populator
diff --git a/build/populator-controller/Containerfile b/build/populator-controller/Containerfile
index 39ee77f59..150d2199b 100644
--- a/build/populator-controller/Containerfile
+++ b/build/populator-controller/Containerfile
@@ -4,7 +4,7 @@ COPY --chown=1001:0 ./ ./
 ENV GOFLAGS "-mod=vendor -tags=strictfipsruntime"
 ENV GOEXPERIMENT strictfipsruntime
 
-RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o controller github.com/konveyor/forklift-controller/cmd/populator-controller
+RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o controller ./cmd/populator-controller/populator-controller.go
 
 FROM registry.access.redhat.com/ubi9-minimal:9.4-1227.1725849298
 # Required to be able to get files from within the pod