diff --git a/Dockerfile.cuda b/Dockerfile.cuda
index 89db9603c..742565b7e 100644
--- a/Dockerfile.cuda
+++ b/Dockerfile.cuda
@@ -8,7 +8,7 @@ ENV CONDA_EXE=$MAMBA_EXE
 ENV CONDA_PREFIX=$MAMBA_ROOT_PREFIX
 ENV CONDA_SHLVL='1'
 
-WORKDIR /build
+WORKDIR /build/core
 
 COPY Makefile .
 
@@ -16,7 +16,5 @@ RUN make deps-cuda
 
 WORKDIR /data
 
-RUN rm -fr /build
-
 CMD ["/usr/local/bin/ocrd", "--help"]
 
diff --git a/Dockerfile.cuda-tf1 b/Dockerfile.cuda-tf1
index 275da3261..abdaf8990 100644
--- a/Dockerfile.cuda-tf1
+++ b/Dockerfile.cuda-tf1
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 FROM $BASE_IMAGE AS ocrd_core_base
 
-WORKDIR /build
+WORKDIR /build/core
 
 COPY Makefile .
 
@@ -9,7 +9,5 @@ RUN make deps-tf1
 
 WORKDIR /data
 
-RUN rm -fr /build
-
 CMD ["/usr/local/bin/ocrd", "--help"]
 
diff --git a/Dockerfile.cuda-tf2 b/Dockerfile.cuda-tf2
index 8a44344b9..c4336be2f 100644
--- a/Dockerfile.cuda-tf2
+++ b/Dockerfile.cuda-tf2
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 FROM $BASE_IMAGE AS ocrd_core_base
 
-WORKDIR /build
+WORKDIR /build/core
 
 COPY Makefile .
 
@@ -9,7 +9,5 @@ RUN make deps-tf2
 
 WORKDIR /data
 
-RUN rm -fr /build
-
 CMD ["/usr/local/bin/ocrd", "--help"]