diff --git a/docker/accumulo/Dockerfile b/docker/accumulo/Dockerfile
index b761eee3..1e20fac2 100644
--- a/docker/accumulo/Dockerfile
+++ b/docker/accumulo/Dockerfile
@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BUILDER_IMAGE_NAME=debian
-ARG BUILDER_IMAGE_TAG=stretch-20220125-slim
+ARG BUILDER_IMAGE_NAME=ubuntu
+ARG BUILDER_IMAGE_TAG=focal-20230412
 
-ARG BASE_IMAGE_NAME=debian
-ARG BASE_IMAGE_TAG=stretch-20220125-slim
+ARG BASE_IMAGE_NAME=ubuntu
+ARG BASE_IMAGE_TAG=focal-20230412
 
 ARG ACCUMULO_VERSION=1.9.3
 ARG HADOOP_VERSION=3.2.2
diff --git a/docker/hdfs/Dockerfile b/docker/hdfs/Dockerfile
index c369a723..caf6f4ed 100644
--- a/docker/hdfs/Dockerfile
+++ b/docker/hdfs/Dockerfile
@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BUILDER_IMAGE_NAME=debian
-ARG BUILDER_IMAGE_TAG=stretch-20220125-slim
+ARG BUILDER_IMAGE_NAME=ubuntu
+ARG BUILDER_IMAGE_TAG=focal-20230412
 
-ARG BASE_IMAGE_NAME=debian
-ARG BASE_IMAGE_TAG=stretch-20220125-slim
+ARG BASE_IMAGE_NAME=ubuntu
+ARG BASE_IMAGE_TAG=focal-20230412
 
 ARG HADOOP_VERSION=3.2.2