diff --git a/Makefile b/Makefile
index b0c874558..95694e0e1 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ cephcsi:
 
 .PHONY: containerized-build containerized-test
 containerized-build: .devel-container-id
-	$(CONTAINER_CMD) run --rm -v $(PWD):/go/src/github.com/ceph/ceph-csi$(SELINUX_VOL_FLAG) $(CSI_IMAGE_NAME):devel make -C /go/src/github.com/ceph/ceph-csi cephcsi
+	$(CONTAINER_CMD) run --rm -v $(PWD):/go/src/github.com/ceph/ceph-csi$(SELINUX_VOL_FLAG) $(CSI_IMAGE_NAME):devel make cephcsi
 
 containerized-test: .test-container-id
 	$(CONTAINER_CMD) run --rm -v $(PWD):/go/src/github.com/ceph/ceph-csi$(SELINUX_VOL_FLAG) $(CSI_IMAGE_NAME):test make test
diff --git a/scripts/Dockerfile.devel b/scripts/Dockerfile.devel
index 590fd8651..4c998b735 100644
--- a/scripts/Dockerfile.devel
+++ b/scripts/Dockerfile.devel
@@ -18,3 +18,5 @@ RUN dnf -y install \
 	librbd-devel \
     && dnf -y update \
     && true
+
+WORKDIR "/go/src/github.com/ceph/ceph-csi"