diff --git a/tools/docker/test/amd64/ubuntu-21.04/cc.Dockerfile b/tools/docker/test/amd64/ubuntu-21.04/cc.Dockerfile
deleted file mode 100644
index 3127118432..0000000000
--- a/tools/docker/test/amd64/ubuntu-21.04/cc.Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM ubuntu:21.04
-
-RUN apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -yq \
- build-essential zlib1g-dev \
-&& apt-get clean \
-&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-WORKDIR /root
-ADD or-tools_amd64_ubuntu-21.04_v*.tar.gz .
-
-RUN cd or-tools_*_v* && make test_cc
diff --git a/tools/docker/test/amd64/ubuntu-21.04/dotnet.Dockerfile b/tools/docker/test/amd64/ubuntu-21.04/dotnet.Dockerfile
deleted file mode 100644
index 4e363ca50c..0000000000
--- a/tools/docker/test/amd64/ubuntu-21.04/dotnet.Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM ubuntu:21.04
-
-RUN apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -yq \
- build-essential zlib1g-dev \
-&& apt-get clean \
-&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Dotnet install
-# see
-# https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-ubuntu-2004
-RUN apt-get update -qq \
-&& apt-get install -yq wget apt-transport-https \
-&& wget -q https://packages.microsoft.com/config/ubuntu/21.04/packages-microsoft-prod.deb \
-&& dpkg -i packages-microsoft-prod.deb \
-&& apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -yq dotnet-sdk-3.1 dotnet-sdk-6.0 \
-&& apt-get clean \
-&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-# Trigger first run experience by running arbitrary cmd
-RUN dotnet --info
-
-#ENV TZ=America/Los_Angeles
-#RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-WORKDIR /root
-ADD or-tools_amd64_ubuntu-21.04_v*.tar.gz .
-
-RUN cd or-tools_*_v* && make test_dotnet
diff --git a/tools/docker/test/amd64/ubuntu-21.04/java.Dockerfile b/tools/docker/test/amd64/ubuntu-21.04/java.Dockerfile
deleted file mode 100644
index 2fa213f9d8..0000000000
--- a/tools/docker/test/amd64/ubuntu-21.04/java.Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM ubuntu:21.04
-
-RUN apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -yq \
- build-essential zlib1g-dev \
-&& apt-get clean \
-&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Java/Maven Install
-RUN apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -yq \
- default-jdk maven \
-&& apt-get clean \
-&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-ENV JAVA_HOME=/usr/lib/jvm/default-java
-
-WORKDIR /root
-ADD or-tools_amd64_ubuntu-21.04_v*.tar.gz .
-
-RUN cd or-tools_*_v* && make test_java