diff --git a/.circleci/config.yml b/.circleci/config.yml
index 317c03a..420fa35 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -132,31 +132,9 @@ jobs:
               echo
             done
 
-  build-ubuntu-impish:
+  build-ubuntu-jammy:
     docker:
-      - image: ubuntu:21.10
-    resource_class: medium+
-    steps:
-      - run: *install-dependencies-deb
-      - checkout
-      - restore_cache: *restore-cache
-      - run: *copy-image
-      - run: *build-deb
-
-  build-ubuntu-hirsute:
-    docker:
-      - image: ubuntu:21.04
-    resource_class: medium+
-    steps:
-      - run: *install-dependencies-deb
-      - checkout
-      - restore_cache: *restore-cache
-      - run: *copy-image
-      - run: *build-deb
-
-  build-ubuntu-groovy:
-    docker:
-      - image: ubuntu:20.10
+      - image: ubuntu:22.04
     resource_class: medium+
     steps:
       - run: *install-dependencies-deb
@@ -187,6 +165,28 @@ jobs:
       - run: *copy-image
       - run: *build-deb
 
+  build-fedora-37:
+    docker:
+      - image: fedora:37
+    resource_class: medium+
+    steps:
+      - run: *install-dependencies-rpm
+      - checkout
+      - restore_cache: *restore-cache
+      - run: *copy-image
+      - run: *build-rpm
+
+  build-fedora-36:
+    docker:
+      - image: fedora:36
+    resource_class: medium+
+    steps:
+      - run: *install-dependencies-rpm
+      - checkout
+      - restore_cache: *restore-cache
+      - run: *copy-image
+      - run: *build-rpm
+
   build-fedora-35:
     docker:
       - image: fedora:35
@@ -198,31 +198,9 @@ jobs:
       - run: *copy-image
       - run: *build-rpm
 
-  build-fedora-34:
-    docker:
-      - image: fedora:34
-    resource_class: medium+
-    steps:
-      - run: *install-dependencies-rpm
-      - checkout
-      - restore_cache: *restore-cache
-      - run: *copy-image
-      - run: *build-rpm
-
-  build-fedora-33:
-    docker:
-      - image: fedora:33
-    resource_class: medium+
-    steps:
-      - run: *install-dependencies-rpm
-      - checkout
-      - restore_cache: *restore-cache
-      - run: *copy-image
-      - run: *build-rpm
-
   deploy-fedora:
     docker:
-      - image: fedora:33
+      - image: fedora:35
     resource_class: medium+
     steps:
       - run: *install-dependencies-rpm
@@ -238,16 +216,16 @@ jobs:
             dnf install -y ruby-devel
             gem install package_cloud
       - run:
-          name: Deploy fedora/33
+          name: Deploy fedora/37
           environment:
             PACKAGE_TYPE: "rpm"
-            PACKAGECLOUD_DISTRO: "fedora/33"
+            PACKAGECLOUD_DISTRO: "fedora/37"
           <<: *deploy-packagecloud
       - run:
-          name: Deploy fedora/34
+          name: Deploy fedora/36
           environment:
             PACKAGE_TYPE: "rpm"
-            PACKAGECLOUD_DISTRO: "fedora/34"
+            PACKAGECLOUD_DISTRO: "fedora/36"
           <<: *deploy-packagecloud
       - run:
           name: Deploy fedora/35
@@ -287,7 +265,7 @@ jobs:
 
   deploy-ubuntu:
     docker:
-      - image: ubuntu:21.04
+      - image: ubuntu:22.04
     resource_class: medium+
     steps:
       - run: *install-dependencies-deb
@@ -302,22 +280,10 @@ jobs:
             gem install -N rake
             gem install -N package_cloud
       - run:
-          name: Deploy ubuntu/impish
+          name: Deploy ubuntu/jammy
           environment:
             PACKAGE_TYPE: "deb"
-            PACKAGECLOUD_DISTRO: "ubuntu/impish"
-          <<: *deploy-packagecloud
-      - run:
-          name: Deploy ubuntu/hirsute
-          environment:
-            PACKAGE_TYPE: "deb"
-            PACKAGECLOUD_DISTRO: "ubuntu/hirsute"
-          <<: *deploy-packagecloud
-      - run:
-          name: Deploy ubuntu/groovy
-          environment:
-            PACKAGE_TYPE: "deb"
-            PACKAGECLOUD_DISTRO: "ubuntu/groovy"
+            PACKAGECLOUD_DISTRO: "ubuntu/jammy"
           <<: *deploy-packagecloud
 
 workflows:
@@ -329,30 +295,25 @@ workflows:
       - convert-test-docs:
           requires:
             - build-container-image
-      - build-ubuntu-impish:
-          requires:
-            - build-container-image
-      - build-ubuntu-hirsute:
-          requires:
-            - build-container-image
-      - build-ubuntu-groovy:
+      - build-ubuntu-jammy:
           requires:
             - build-container-image
       - build-debian-bullseye:
           requires:
             - build-container-image
-      - build-debian-bookworm:
+      ## Waiting for upstream fix https://github.com/freedomofpress/dangerzone/issues/172
+      #- build-debian-bookworm:
+      #    requires:
+      #      - build-container-image
+      - build-fedora-37:
+          requires:
+            - build-container-image
+      - build-fedora-36:
           requires:
             - build-container-image
       - build-fedora-35:
           requires:
             - build-container-image
-      - build-fedora-34:
-          requires:
-            - build-container-image
-      - build-fedora-33:
-          requires:
-            - build-container-image
 
   build-and-deploy:
     jobs: