diff --git a/tools/docker/README.md b/tools/docker/README.md
index dd1dbe99fc..fea946830f 100644
--- a/tools/docker/README.md
+++ b/tools/docker/README.md
@@ -4,8 +4,8 @@
 - Ubuntu
   - bionic  (Ubuntu 18.04)
   - focal   (Ubuntu 20.04)
-  - groovy  (Ubuntu 20.10)
-  - hirsute (Ubuntu 21.04)
+  - jammy   (Ubuntu 22.04)
+  - kinetic (Ubuntu 22.10)
 - Debian
   - stretch (Debian  9.0)
   - buster  (Debian 10.0)
diff --git a/tools/docker/groovy/Dockerfile b/tools/docker/jammy/Dockerfile
similarity index 97%
rename from tools/docker/groovy/Dockerfile
rename to tools/docker/jammy/Dockerfile
index 6fc1ebe936..38554071af 100644
--- a/tools/docker/groovy/Dockerfile
+++ b/tools/docker/jammy/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:groovy
+FROM ubuntu:jammy
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/tools/docker/hirsute/Dockerfile b/tools/docker/kinetic/Dockerfile
similarity index 97%
rename from tools/docker/hirsute/Dockerfile
rename to tools/docker/kinetic/Dockerfile
index 8773020ad3..5d15869eb5 100644
--- a/tools/docker/hirsute/Dockerfile
+++ b/tools/docker/kinetic/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:hirsute
+FROM ubuntu:kinetic
 
 ARG DEBIAN_FRONTEND=noninteractive