diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index 32dfad7c5..bae0a9ebe 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -21,6 +21,9 @@ jobs:
           - name: debian
             codename: stretch
             has32bit: true
+          - name: ubuntu
+            codename: hirsute
+            has32bit: false
           - name: ubuntu
             codename: groovy
             has32bit: false
@@ -30,9 +33,6 @@ jobs:
           - name: ubuntu
             codename: bionic
             has32bit: true
-          - name: ubuntu
-            codename: xenial
-            has32bit: true
 
     runs-on: ubuntu-latest
 
@@ -116,16 +116,11 @@ jobs:
             -e ICINGA_BUILD_TYPE=snapshot \
             registry.icinga.com/build-docker/${{ matrix.distro.name }}/${{ matrix.distro.codename }}:x86 \
             icinga-build-test
-
-      - name: Artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: '${{ matrix.distro.name }}-${{ matrix.distro.codename }}-packages'
-          path: deb-icinga2/build
   rpm:
     name: .rpm
 
     strategy:
+      fail-fast: false
       matrix:
         distro:
           - name: centos
@@ -133,15 +128,15 @@ jobs:
           - name: centos
             release: 7
           - name: fedora
-            release: 32
+            release: 34
           - name: fedora
-            release: 31
+            release: 33
           - name: sles
-            release: '15.1'
+            release: '15.2'
           - name: sles
             release: '12.5'
           - name: opensuse
-            release: '15.1'
+            release: '15.2'
 
     runs-on: ubuntu-latest
 
@@ -220,17 +215,11 @@ jobs:
             -e ICINGA_BUILD_TYPE=snapshot \
             registry.icinga.com/build-docker/${{ matrix.distro.name }}/${{ matrix.distro.release }} \
             icinga-build-test
-
-      - name: Artifacts
-        if: "steps.vars.outputs.CAN_BUILD == 'true'"
-        uses: actions/upload-artifact@v1
-        with:
-          name: '${{ matrix.distro.name }}-${{ matrix.distro.release }}-packages'
-          path: rpm-icinga2/build
   raspbian:
     name: Raspbian
 
     strategy:
+      fail-fast: false
       matrix:
         codename:
           - buster
@@ -298,9 +287,3 @@ jobs:
 #            -e ICINGA_BUILD_DEB_DEFAULT_ARCH=armhf \
 #            registry.icinga.com/build-docker/raspbian/${{ matrix.codename }} \
 #            icinga-build-test
-
-      - name: Artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: 'raspbian-${{ matrix.codename }}-packages'
-          path: raspbian-icinga2/build