diff --git a/Makefile b/Makefile
index 749ea0e..b69b978 100644
--- a/Makefile
+++ b/Makefile
@@ -52,8 +52,8 @@ generate: controller-gen
 
 # Build the docker image
 docker-build: test
-	docker build . -t ${IMG}
-	docker build . -t ${WORKERIMG} --file Dockerfile.worker
+	docker build  -f ./controllers/Dockerfile . -t ${IMG}
+	docker build  -f ./worker/Dockerfile.worker . -t ${WORKERIMG}
 	@echo "updating kustomize image patch file for manager resource"
 	sed -i'' -e 's@image: .*@image: '"${IMG}"'@' ./config/default/manager_image_patch.yaml
 
diff --git a/Dockerfile b/controllers/Dockerfile
similarity index 100%
rename from Dockerfile
rename to controllers/Dockerfile
diff --git a/Dockerfile.worker b/worker/Dockerfile.worker
similarity index 100%
rename from Dockerfile.worker
rename to worker/Dockerfile.worker
diff --git a/kube-forensics-worker.sh b/worker/kube-forensics-worker.sh
similarity index 100%
rename from kube-forensics-worker.sh
rename to worker/kube-forensics-worker.sh