diff --git a/roles/openshift-apps/flatpak-indexer/files/imagestream.yml b/roles/openshift-apps/flatpak-indexer/files/imagestream.yml
index c7546d9cab..91a9ee7d15 100644
--- a/roles/openshift-apps/flatpak-indexer/files/imagestream.yml
+++ b/roles/openshift-apps/flatpak-indexer/files/imagestream.yml
@@ -25,7 +25,7 @@ spec:
   - name: latest
     from:
       kind: DockerImage
-      name: registry.fedoraproject.org/fedora:40
+      name: registry.fedoraproject.org/fedora:42
     importPolicy:
       scheduled: true
     referencePolicy:
@@ -34,7 +34,7 @@ spec:
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
-  name: ubi8-go-toolset
+  name: ubi9-go-toolset
 spec:
   lookupPolicy:
     local: false
@@ -42,7 +42,7 @@ spec:
   - name: latest
     from:
       kind: DockerImage
-      name: registry.access.redhat.com/ubi8/go-toolset:latest
+      name: registry.access.redhat.com/ubi9/go-toolset:latest
     importPolicy:
       scheduled: true
     referencePolicy:
@@ -51,7 +51,7 @@ spec:
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
-  name: ubi8-python-39
+  name: ubi9-python-39
 spec:
   lookupPolicy:
     local: false
@@ -59,7 +59,7 @@ spec:
   - name: latest
     from:
       kind: DockerImage
-      name: registry.access.redhat.com/ubi8/python-39:latest
+      name: registry.access.redhat.com/ubi9/python-39:latest
     importPolicy:
       scheduled: true
     referencePolicy:
diff --git a/roles/openshift-apps/flatpak-indexer/templates/buildconfig.yml.j2 b/roles/openshift-apps/flatpak-indexer/templates/buildconfig.yml.j2
index b798bb9b70..8aa440bde1 100644
--- a/roles/openshift-apps/flatpak-indexer/templates/buildconfig.yml.j2
+++ b/roles/openshift-apps/flatpak-indexer/templates/buildconfig.yml.j2
@@ -21,7 +21,7 @@ spec:
     dockerStrategy:
       from:
         kind: ImageStreamTag
-        name: ubi8-go-toolset:latest
+        name: ubi9-go-toolset:latest
       noCache: true
     type: Docker
   triggers:
@@ -65,7 +65,7 @@ spec:
         value: "1"
       from:
         kind: ImageStreamTag
-        name: ubi8-python-39:latest
+        name: ubi9-python-39:latest
     type: Source
   triggers:
   - type: ConfigChange
@@ -99,7 +99,7 @@ spec:
     dockerStrategy:
       from:
         kind: ImageStreamTag
-        name: fedora:40
+        name: fedora:latest
       noCache: true
     type: Docker
   triggers: