diff --git a/.common-ci.yml b/.common-ci.yml
index 44675bd6..e9bd5a5c 100644
--- a/.common-ci.yml
+++ b/.common-ci.yml
@@ -57,6 +57,10 @@ stages:
   variables:
     DIST: debian9
 
+.dist-fedora35:
+  variables:
+    DIST: fedora35
+
 .dist-opensuse-leap15.1:
   variables:
     DIST: opensuse-leap15.1
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 919d6588..71261fc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -158,6 +158,18 @@ package-debian9-amd64:
     - .dist-debian9
     - .arch-amd64
 
+package-fedora35-aarch64:
+  extends:
+    - .package-build
+    - .dist-fedora35
+    - .arch-aarch64
+
+package-fedora35-x86_64:
+  extends:
+    - .package-build
+    - .dist-fedora35
+    - .arch-x86_64
+
 package-opensuse-leap15.1-x86_64:
   extends:
     - .package-build
@@ -278,6 +290,8 @@ image-packaging:
     - package-centos8-x86_64
     - package-debian10-amd64
     - package-debian9-amd64
+    - package-fedora35-aarch64
+    - package-fedora35-x86_64
     - package-opensuse-leap15.1-x86_64
     - package-ubuntu16.04-amd64
     - package-ubuntu16.04-ppc64le