diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4dfd49587..5bbd25689 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1,7 @@
 *    @HarryMichal @debarshiray
 /.github/workflows/arch-images.yaml       @Foxboron
 /.github/workflows/arch-images-pr.yaml    @Foxboron
+/.github/workflows/ubuntu-images.yaml     @Jmennius
 /data/gfx/*.gif    @jimmac
 /images/arch       @Foxboron
 /images/rhel       @debarshiray @olivergs
diff --git a/.zuul.yaml b/.zuul.yaml
index 774a56ee5..434e58016 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -81,24 +81,12 @@
     pre-run: playbooks/setup-env.yaml
     run: playbooks/system-test.yaml
 
-- job:
-    name: system-test-fedora-36
-    description: Run Toolbx's system tests in Fedora 36
-    timeout: 2400
-    nodeset:
-      nodes:
-        - name: fedora-36
-          label: cloud-fedora-36
-    pre-run: playbooks/setup-env.yaml
-    run: playbooks/system-test.yaml
-
 - project:
     periodic:
       jobs:
         - system-test-fedora-rawhide
         - system-test-fedora-38
         - system-test-fedora-37
-        - system-test-fedora-36
     check:
       jobs:
         - unit-test
@@ -107,7 +95,6 @@
         - system-test-fedora-rawhide
         - system-test-fedora-38
         - system-test-fedora-37
-        - system-test-fedora-36
     gate:
       jobs:
         - unit-test
@@ -116,4 +103,3 @@
         - system-test-fedora-rawhide
         - system-test-fedora-38
         - system-test-fedora-37
-        - system-test-fedora-36