docker-library
diff --git a/‎3.8-rc/ubuntu/Dockerfile
+2-2 b/‎3.8-rc/ubuntu/Dockerfile
+2-2
diff --git a/‎3.8/ubuntu/Dockerfile
+2-2 b/‎3.8/ubuntu/Dockerfile
+2-2
diff --git a/‎Dockerfile-ubuntu.template
+2-2 b/‎Dockerfile-ubuntu.template
+2-2
@@ -1,6 +1,6 @@
-# The official Canonical Ubuntu Bionic image is ideal from a security perspective,
+# The official Canonical Ubuntu Focal image is ideal from a security perspective,
 # especially for the enterprises that we, the RabbitMQ team, have to deal with
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 RUN set -eux; \
 	apt-get update; \