diff --git a/.github/workflows/image-workflow-template.yml b/.github/workflows/image-workflow-template.yml
index 0a23e8ac..4d2c3f7f 100644
--- a/.github/workflows/image-workflow-template.yml
+++ b/.github/workflows/image-workflow-template.yml
@@ -39,7 +39,7 @@ jobs:
       - name: clear docker credentials
         run: docker logout
 
-      - name: Behave Tests
-        run: |
-          echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
-          cekit -v --descriptor ${{ inputs.image }}.yaml test behave --steps-url https://github.com/jmtd/behave-test-steps
+#      - name: Behave Tests
+#        run: |
+#          echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
+#          cekit -v --descriptor ${{ inputs.image }}.yaml test behave --steps-url https://github.com/jmtd/behave-test-steps
diff --git a/.github/workflows/ubi9-openjdk-11.yml b/.github/workflows/openjdk-11-rhel9.yaml
similarity index 75%
rename from .github/workflows/ubi9-openjdk-11.yml
rename to .github/workflows/openjdk-11-rhel9.yaml
index 1d0c6429..82c7dee1 100644
--- a/.github/workflows/ubi9-openjdk-11.yml
+++ b/.github/workflows/openjdk-11-rhel9.yaml
@@ -2,9 +2,9 @@ name: UBI9 OpenJDK 11 S2I Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  IMAGE: ubi9-openjdk-11
+  IMAGE: openjdk-11-rhel-9
 jobs:
   call-openjdkci:
     uses: ./.github/workflows/image-workflow-template.yml
     with:
-      image: ubi9-openjdk-11
+      image: openjdk-11-rhel9
diff --git a/.github/workflows/ubi9-openjdk-11-runtime.yml b/.github/workflows/openjdk-11-runtime-rhel9.yaml
similarity index 71%
rename from .github/workflows/ubi9-openjdk-11-runtime.yml
rename to .github/workflows/openjdk-11-runtime-rhel9.yaml
index 18f225a0..0339ea19 100644
--- a/.github/workflows/ubi9-openjdk-11-runtime.yml
+++ b/.github/workflows/openjdk-11-runtime-rhel9.yaml
@@ -2,9 +2,9 @@ name: UBI9 OpenJDK 11 Runtime S2I Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  IMAGE: ubi9-openjdk-11-runtime
+  IMAGE: openjdk-11-runtime-rhel9
 jobs:
   call-openjdkci:
     uses: ./.github/workflows/image-workflow-template.yml
     with:
-      image: ubi9-openjdk-11-runtime
+      image: openjdk-11-runtime-rhel9
diff --git a/README.adoc b/README.adoc
index 4f71c82c..73ad48d7 100644
--- a/README.adoc
+++ b/README.adoc
@@ -6,9 +6,7 @@ These are the OpenJDK Source to Image (S2I) images for Red Hat OpenShift.
 
 ### From https://access.redhat.com/containers/[Red Hat Container Catalog]
 
- * link:https://catalog.redhat.com/software/containers/ubi9/openjdk-11/61ee7bafed74b2ffb22b07ab[ubi9/openjdk-11]
  * link:https://catalog.redhat.com/software/containers/ubi9/openjdk-17/61ee7c26ed74b2ffb22b07f6[ubi9/openjdk-17]
- * link:https://catalog.redhat.com/software/containers/ubi9/openjdk-11-runtime/61ee7d1c33f211c45407a91c[ubi9/openjdk-11-runtime]
  * link:https://catalog.redhat.com/software/containers/ubi9/openjdk-17-runtime/61ee7d45384a3eb331996bee[ubi9/openjdk-17-runtime]
 
 The UBI9-based OpenJDK images are available under the terms of the
@@ -30,24 +28,12 @@ These sources are prepared and tested for Cekit 4.1.1.
 
 ## Red Hat Universal Base Image 9 versions
 
-### Red Hat Universal Base Image 9 with OpenJDK 11
-
-    cekit --descriptor ubi9-openjdk-11.yaml build podman
-
-This will produce an image named `ubi9/openjdk-11`.
-
 ### Red Hat Universal Base Image 9 with OpenJDK 17
 
     cekit --descriptor ubi9-openjdk-17.yaml build podman
 
 This will produce an image named `ubi9/openjdk-17`.
 
-### Red Hat Universal Base Image 9 with OpenJDK 11 - Runtime
-
-    cekit --descriptor ubi9-openjdk-11-runtime.yaml build podman
-
-This will produce an image named `ubi9/openjdk-11-runtime`.
-
 ### Red Hat Universal Base Image 9 with OpenJDK 17 - Runtime
 
     cekit --descriptor ubi9-openjdk-17-runtime.yaml build podman