diff --git a/roles/openshift-apps/compose-tracker/templates/buildconfig.yml b/roles/openshift-apps/compose-tracker/templates/buildconfig.yml
index e4fd7b59ce..933c5be500 100644
--- a/roles/openshift-apps/compose-tracker/templates/buildconfig.yml
+++ b/roles/openshift-apps/compose-tracker/templates/buildconfig.yml
@@ -19,7 +19,7 @@ spec:
     dockerStrategy:
       from:
         kind: ImageStreamTag
-        name: fedora:34
+        name: fedora:36
   output:
     to:
       kind: ImageStreamTag
diff --git a/roles/openshift-apps/compose-tracker/templates/imagestream.yml b/roles/openshift-apps/compose-tracker/templates/imagestream.yml
index 9adfaccb2d..0d6aa9982a 100644
--- a/roles/openshift-apps/compose-tracker/templates/imagestream.yml
+++ b/roles/openshift-apps/compose-tracker/templates/imagestream.yml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: List
 items:
-# ImageStream for Fedora 31 image
+# ImageStream for Fedora 36 image
 - apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
@@ -12,10 +12,10 @@ items:
     lookupPolicy:
       local: false
     tags:
-    - name: "34"
+    - name: "36"
       from:
         kind: DockerImage
-        name: registry.fedoraproject.org/fedora:34
+        name: registry.fedoraproject.org/fedora:36
       importPolicy: 
         scheduled: true
       referencePolicy: