diff --git a/cli-dev.yaml b/cli-dev.yaml
index 71e2635..b92d829 100644
--- a/cli-dev.yaml
+++ b/cli-dev.yaml
@@ -1,7 +1,7 @@
 - name: infinispan/cli
   version: latest
   description: Infinispan Quarkus Server
-  from: registry.access.redhat.com/ubi9/ubi-minimal
+  from: registry.access.redhat.com/ubi8/ubi-minimal
   artifacts:
   - name: cli
     path: artifacts/cli
diff --git a/cli.yaml b/cli.yaml
index 64edafc..d90aa5f 100644
--- a/cli.yaml
+++ b/cli.yaml
@@ -15,7 +15,7 @@
 - name: infinispan/cli
   version: 14.0.0.Dev04-1
   description: Infinispan Quarkus Server
-  from: registry.access.redhat.com/ubi9/ubi-minimal
+  from: registry.access.redhat.com/ubi8/ubi-minimal
   artifacts:
   - name: cli
     image: native-builder
diff --git a/server-dev-native.yaml b/server-dev-native.yaml
index 03005a4..a5433c8 100644
--- a/server-dev-native.yaml
+++ b/server-dev-native.yaml
@@ -1,7 +1,7 @@
 - name: infinispan/server-native
   version: latest
   description: Infinispan Quarkus Server
-  from: registry.access.redhat.com/ubi9/ubi-minimal
+  from: registry.access.redhat.com/ubi8/ubi-minimal
   artifacts:
     - name: cli
       path: artifacts/cli
diff --git a/server-native.yaml b/server-native.yaml
index 1a75359..475be7f 100644
--- a/server-native.yaml
+++ b/server-native.yaml
@@ -16,7 +16,7 @@
 - name: infinispan/server-native
   version: 14.0.0.Dev04-1
   description: Infinispan Quarkus Server
-  from: registry.access.redhat.com/ubi9/ubi-minimal
+  from: registry.access.redhat.com/ubi8/ubi-minimal
   artifacts:
   - name: cli
     image: native-builder