diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cbff1c53169bf1426f15a75d827a8ce95c1d514b..51f7f48425d8449350901595fa954a9207e43793 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -195,6 +195,49 @@ upload/debian/jessie:
 ###################################
 # Ubuntu
 ###################################
+
+# eoan
+ubuntu/eoan:
+  <<: *source
+  variables:
+    DOCKER_IMAGE: ubuntu/eoan
+
+ubuntu/eoan:x86_64:
+  <<: *binary
+  variables:
+    DOCKER_IMAGE: ubuntu/eoan
+  dependencies:
+    - ubuntu/eoan
+
+test/ubuntu/eoan:x86_64:
+  <<: *test
+  variables:
+    DOCKER_IMAGE: ubuntu/eoan
+  dependencies:
+    - ubuntu/eoan
+
+ubuntu/eoan:x86:
+  <<: *binary
+  variables:
+    DOCKER_IMAGE: ubuntu/eoan:x86
+  dependencies:
+    - ubuntu/eoan
+
+test/ubuntu/eoan:x86:
+  <<: *test
+  variables:
+    DOCKER_IMAGE: ubuntu/eoan:x86
+  dependencies:
+    - ubuntu/eoan:x86
+    - ubuntu/eoan:x86_64
+
+upload/ubuntu/eoan:
+  <<: *upload
+  dependencies:
+    - ubuntu/eoan:x86
+    - ubuntu/eoan:x86_64
+    - ubuntu/eoan
+
 ubuntu/focal:
   <<: *source
   variables: