diff --git a/Dockerfile-dinglehopper b/Dockerfile-dinglehopper
index e081f31..b233d2c 100644
--- a/Dockerfile-dinglehopper
+++ b/Dockerfile-dinglehopper
@@ -1,5 +1,5 @@
 ARG DRONE_COMMIT="latest"
-FROM mikegerber/my_ocrd_workflow-core:$DRONE_COMMIT
+FROM mikegerber/ocrd-galley-core:$DRONE_COMMIT
 
 ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG DINGLEHOPPER_COMMIT="6e47acd"
diff --git a/Dockerfile-ocrd_calamari b/Dockerfile-ocrd_calamari
index d1b74d5..2fc53ca 100644
--- a/Dockerfile-ocrd_calamari
+++ b/Dockerfile-ocrd_calamari
@@ -1,5 +1,5 @@
 ARG DRONE_COMMIT="latest"
-FROM mikegerber/my_ocrd_workflow-core-cuda10.1:$DRONE_COMMIT
+FROM mikegerber/ocrd-galley-core-cuda10.1:$DRONE_COMMIT
 
 
 # XXX https://github.com/OCR-D/core/issues/642
diff --git a/Dockerfile-ocrd_calamari03 b/Dockerfile-ocrd_calamari03
index 9879891..beb9f82 100644
--- a/Dockerfile-ocrd_calamari03
+++ b/Dockerfile-ocrd_calamari03
@@ -1,5 +1,5 @@
 ARG DRONE_COMMIT="latest"
-FROM mikegerber/my_ocrd_workflow-core-cuda10.0:$DRONE_COMMIT
+FROM mikegerber/ocrd-galley-core-cuda10.0:$DRONE_COMMIT
 
 ARG PIP_INSTALL="pip install --no-cache-dir"
 
diff --git a/Dockerfile-ocrd_cis b/Dockerfile-ocrd_cis
index 068a82e..f6fc316 100644
--- a/Dockerfile-ocrd_cis
+++ b/Dockerfile-ocrd_cis
@@ -1,5 +1,5 @@
 ARG DRONE_COMMIT="latest"
-FROM mikegerber/my_ocrd_workflow-core:$DRONE_COMMIT
+FROM mikegerber/ocrd-galley-core:$DRONE_COMMIT
 
 ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG OCRD_CIS_VERSION="0.1.5"
diff --git a/Dockerfile-ocrd_fileformat b/Dockerfile-ocrd_fileformat
index d9e8fe4..c09be72 100644
--- a/Dockerfile-ocrd_fileformat
+++ b/Dockerfile-ocrd_fileformat
@@ -1,5 +1,5 @@
 ARG DRONE_COMMIT="latest"
-FROM mikegerber/my_ocrd_workflow-core:$DRONE_COMMIT
+FROM mikegerber/ocrd-galley-core:$DRONE_COMMIT
 
 ARG PIP_INSTALL="pip install --no-cache-dir"
 # XXX ARG OCRD_FILEFORMAT_VERSION="0.2.0"
diff --git a/Dockerfile-ocrd_olena b/Dockerfile-ocrd_olena
index 124c122..1cab988 100644
--- a/Dockerfile-ocrd_olena
+++ b/Dockerfile-ocrd_olena
@@ -1,5 +1,5 @@
 ARG DRONE_COMMIT="latest"
-FROM mikegerber/my_ocrd_workflow-core:$DRONE_COMMIT
+FROM mikegerber/ocrd-galley-core:$DRONE_COMMIT
 
 ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG OCRD_OLENA_VERSION="1.2.0"
diff --git a/Dockerfile-ocrd_segment b/Dockerfile-ocrd_segment
index d374111..7b7c107 100644
--- a/Dockerfile-ocrd_segment
+++ b/Dockerfile-ocrd_segment
@@ -1,5 +1,5 @@
 ARG DRONE_COMMIT="latest"
-FROM mikegerber/my_ocrd_workflow-core:$DRONE_COMMIT
+FROM mikegerber/ocrd-galley-core:$DRONE_COMMIT
 
 ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG OCRD_SEGMENT_VERSION="0.1.8"
diff --git a/Dockerfile-ocrd_tesserocr b/Dockerfile-ocrd_tesserocr
index 045ad37..26d80c7 100644
--- a/Dockerfile-ocrd_tesserocr
+++ b/Dockerfile-ocrd_tesserocr
@@ -1,5 +1,5 @@
 ARG DRONE_COMMIT="latest"
-FROM mikegerber/my_ocrd_workflow-core:$DRONE_COMMIT
+FROM mikegerber/ocrd-galley-core:$DRONE_COMMIT
 
 ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG TESSDATA_BEST_VERSION="4.0.0"
diff --git a/Dockerfile-sbb_binarization b/Dockerfile-sbb_binarization
index 85b35cc..58d398d 100644
--- a/Dockerfile-sbb_binarization
+++ b/Dockerfile-sbb_binarization
@@ -1,5 +1,5 @@
 ARG DRONE_COMMIT="latest"
-FROM mikegerber/my_ocrd_workflow-core-cuda10.0:$DRONE_COMMIT
+FROM mikegerber/ocrd-galley-core-cuda10.0:$DRONE_COMMIT
 
 ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG SBB_BINARIZATION_COMMIT="ea69494"
diff --git a/Dockerfile-sbb_textline_detector b/Dockerfile-sbb_textline_detector
index 39daace..4645b10 100644
--- a/Dockerfile-sbb_textline_detector
+++ b/Dockerfile-sbb_textline_detector
@@ -1,5 +1,5 @@
 ARG DRONE_COMMIT="latest"
-FROM mikegerber/my_ocrd_workflow-core-cuda10.0:$DRONE_COMMIT
+FROM mikegerber/ocrd-galley-core-cuda10.0:$DRONE_COMMIT
 
 ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG SBB_TEXTLINE_DETECTOR_COMMIT="451b71f"
diff --git a/build b/build
index cec6022..47ce8be 100755
--- a/build
+++ b/build
@@ -33,5 +33,5 @@ else
   sub_images="$sub_images `ls -1 Dockerfile-* | sed 's/Dockerfile-//'`"
 fi
 for sub_image in $sub_images; do
-  docker build --cache-from=my_ocrd_workflow-$sub_image -t my_ocrd_workflow-$sub_image -f Dockerfile-$sub_image .
+  docker build --cache-from=ocrd-galley-$sub_image -t ocrd-galley-$sub_image -f Dockerfile-$sub_image .
 done