diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53ed427b..209dc004 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -225,17 +225,6 @@ debian:stable@container-prep:
     FDO_DISTRIBUTION_PACKAGES: $DEBIAN_PACKAGES
     FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
 
-ubuntu:20.04@container-prep:
-  extends:
-    - .fdo.container-build@ubuntu
-    - .policy
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '20.04'
-    FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
-    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
-
 ubuntu:20.10@container-prep:
   extends:
     - .fdo.container-build@ubuntu
@@ -247,6 +236,17 @@ ubuntu:20.10@container-prep:
     FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
 
+ubuntu:21.04@container-prep:
+  extends:
+    - .fdo.container-build@ubuntu
+    - .policy
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+    FDO_DISTRIBUTION_VERSION: '21.04'
+    FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
+    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
+
 arch:rolling@container-prep:
   extends:
     - .fdo.container-build@arch
@@ -380,15 +380,6 @@ debian:stable@container-clean:
     FDO_DISTRIBUTION_VERSION: 'stable'
     FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
 
-ubuntu:20.04@container-clean:
-  extends:
-    - .container-clean
-  variables:
-    GIT_STRATEGY: none
-    CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '20.04'
-    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
-
 ubuntu:20.10@container-clean:
   extends:
     - .container-clean
@@ -398,6 +389,15 @@ ubuntu:20.10@container-clean:
     FDO_DISTRIBUTION_VERSION: '20.10'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
 
+ubuntu:21.04@container-clean:
+  extends:
+    - .container-clean
+  variables:
+    GIT_STRATEGY: none
+    CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
+    FDO_DISTRIBUTION_VERSION: '21.04'
+    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
+
 arch:rolling@container-clean:
   extends:
     - .container-clean
@@ -953,18 +953,6 @@ debian:stable@default-build:
     - "debian:stable@container-prep"
 
 
-ubuntu:20.04@default-build:
-  stage: distro
-  extends:
-    - .build@template
-    - .fdo.distribution-image@ubuntu
-  variables:
-    FDO_DISTRIBUTION_VERSION: '20.04'
-    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
-  needs:
-    - "ubuntu:20.04@container-prep"
-
-
 ubuntu:20.10@default-build:
   stage: distro
   extends:
@@ -977,6 +965,18 @@ ubuntu:20.10@default-build:
     - "ubuntu:20.10@container-prep"
 
 
+ubuntu:21.04@default-build:
+  stage: distro
+  extends:
+    - .build@template
+    - .fdo.distribution-image@ubuntu
+  variables:
+    FDO_DISTRIBUTION_VERSION: '21.04'
+    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
+  needs:
+    - "ubuntu:21.04@container-prep"
+
+
 arch:rolling@default-build:
   stage: distro
   extends:
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index c3569cbb..4046a023 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -63,8 +63,8 @@ distributions:
   - name: ubuntu
     tag: *default_tag
     versions:
-      - '20.04'
       - '20.10'
+      - '21.04'
     packages:
       - git
       - gcc