diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index aa1d72e..943189e 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -3,7 +3,7 @@ name: Cockpit Session Recording
 agent:
   machine:
     type: e1-standard-2
-    os_image: ubuntu1804
+    os_image: ubuntu2004
 
 blocks:
   - name: "Run checks"
@@ -21,7 +21,7 @@ blocks:
           - make test/common
           - make bots
       jobs:
-      - name: Check fedora-34
+      - name: Check fedora-35
         commands:
           - export TEST_OS=fedora-35
           - bots/image-customize -v -i cockpit-ws -i cockpit-packagekit -i `pwd`/cockpit-session-recording*.noarch.rpm -s `pwd`/test/vm.install $TEST_OS