diff --git a/packaging/docker-build/Dockerfile-debian-11-tester b/packaging/docker-build/Dockerfile-debian-11-tester
deleted file mode 100644
index 8b8c3995..00000000
--- a/packaging/docker-build/Dockerfile-debian-11-tester
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019 The Last Pickle Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#ARG EXTRA_PACKAGES="python-dev python-pip"
-ARG BUILD_IMAGE=ubuntu:18.04
-FROM ${BUILD_IMAGE}
-
-ARG DEBIAN_FRONTEND=noninteractive
-ARG BUILD_IMAGE
-ENV TZ=Europe/Paris
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-# use a common app path, copied from python-onbuild:latest
-ENV WORKDIR /usr/src/app
-RUN mkdir -p ${WORKDIR}
-WORKDIR ${WORKDIR}
-
-# # install dependencies
-RUN apt-get update \
-    && apt-get install -y \
-        python3 \
-        python3-venv \
-        $EXTRA_PACKAGES
-
-# Add entrypoint script
-COPY packaging/docker-build/docker-entrypoint-test.sh ${WORKDIR}
-ENTRYPOINT ["/usr/src/app/docker-entrypoint-test.sh"]
diff --git a/packaging/docker-build/Dockerfile-debian-12-tester b/packaging/docker-build/Dockerfile-debian-12-tester
deleted file mode 100644
index 8b8c3995..00000000
--- a/packaging/docker-build/Dockerfile-debian-12-tester
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019 The Last Pickle Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#ARG EXTRA_PACKAGES="python-dev python-pip"
-ARG BUILD_IMAGE=ubuntu:18.04
-FROM ${BUILD_IMAGE}
-
-ARG DEBIAN_FRONTEND=noninteractive
-ARG BUILD_IMAGE
-ENV TZ=Europe/Paris
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-# use a common app path, copied from python-onbuild:latest
-ENV WORKDIR /usr/src/app
-RUN mkdir -p ${WORKDIR}
-WORKDIR ${WORKDIR}
-
-# # install dependencies
-RUN apt-get update \
-    && apt-get install -y \
-        python3 \
-        python3-venv \
-        $EXTRA_PACKAGES
-
-# Add entrypoint script
-COPY packaging/docker-build/docker-entrypoint-test.sh ${WORKDIR}
-ENTRYPOINT ["/usr/src/app/docker-entrypoint-test.sh"]
diff --git a/packaging/docker-build/Dockerfile-ubuntu-tester b/packaging/docker-build/Dockerfile-tester
similarity index 96%
rename from packaging/docker-build/Dockerfile-ubuntu-tester
rename to packaging/docker-build/Dockerfile-tester
index 7d2ecbfd..688cfcbd 100644
--- a/packaging/docker-build/Dockerfile-ubuntu-tester
+++ b/packaging/docker-build/Dockerfile-tester
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-ARG EXTRA_PACKAGES="python-dev python-pip"
 ARG BUILD_IMAGE=ubuntu:18.04
 FROM ${BUILD_IMAGE}
 
diff --git a/packaging/docker-build/docker-compose.yml b/packaging/docker-build/docker-compose.yml
index 31ab8898..fc261623 100644
--- a/packaging/docker-build/docker-compose.yml
+++ b/packaging/docker-build/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       platforms:
         - linux/amd64
       context: ../..
-      dockerfile: packaging/docker-build/Dockerfile-ubuntu-tester
+      dockerfile: packaging/docker-build/Dockerfile-tester
       args:
         - BUILD_IMAGE=ubuntu:20.04
     volumes:
@@ -53,7 +53,7 @@ services:
       platforms:
         - linux/amd64
       context: ../..
-      dockerfile: packaging/docker-build/Dockerfile-debian-11-tester
+      dockerfile: packaging/docker-build/Dockerfile-tester
       args:
         - BUILD_IMAGE=debian:bullseye
     volumes:
@@ -75,7 +75,7 @@ services:
       platforms:
         - linux/amd64
       context: ../..
-      dockerfile: packaging/docker-build/Dockerfile-debian-12-tester
+      dockerfile: packaging/docker-build/Dockerfile-tester
       args:
         - BUILD_IMAGE=debian:bookworm
     volumes: