diff --git a/docker/gcc/Dockerfile b/docker/gcc/Dockerfile
index c305a5ef..71aec690 100644
--- a/docker/gcc/Dockerfile
+++ b/docker/gcc/Dockerfile
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception
 
-ARG BASE=ubuntu:20.04
+ARG BASE=ubuntu:22.04
 FROM $BASE
 
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/docker/rocm/Dockerfile b/docker/rocm/Dockerfile
index c0f5fc5c..c42ce74a 100644
--- a/docker/rocm/Dockerfile
+++ b/docker/rocm/Dockerfile
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception
 
-ARG BASE=rocm/dev-ubuntu-20.04
+ARG BASE=rocm/dev-ubuntu-22.04:5.6-complete
 FROM $BASE
 
 ARG ADDITIONAL_PACKAGES