diff --git a/ci-operator/step-registry/idp/external-oidc/entraid/console-app/redirect-uri/remove/idp-external-oidc-entraid-console-app-redirect-uri-remove-commands.sh b/ci-operator/step-registry/idp/external-oidc/entraid/console-app/redirect-uri/remove/idp-external-oidc-entraid-console-app-redirect-uri-remove-commands.sh
index 3259723b31a16..eb3dbc409ee0e 100644
--- a/ci-operator/step-registry/idp/external-oidc/entraid/console-app/redirect-uri/remove/idp-external-oidc-entraid-console-app-redirect-uri-remove-commands.sh
+++ b/ci-operator/step-registry/idp/external-oidc/entraid/console-app/redirect-uri/remove/idp-external-oidc-entraid-console-app-redirect-uri-remove-commands.sh
@@ -44,8 +44,8 @@ CONSOLE_HOST="$(oc --kubeconfig="$KUBECONFIG" get route console -n openshift-con
 CONSOLE_CLIENT_ID="$(</var/run/hypershift-ext-oidc-app-console/client-id)"
 CONSOLE_CALLBACK_URI="https://${CONSOLE_HOST}/auth/callback"
 CONSOLE_REDIRECT_URIS="$(az ad app show --id "$CONSOLE_CLIENT_ID" --query 'web.redirectUris' -o tsv)"
-if ! grep "$CONSOLE_CALLBACK_URI" <<< "$CONSOLE_REDIRECT_URIS"; then
-    echo "The URI to remove $CONSOLE_REDIRECT_URIS is not found within the list of redirect uris $CONSOLE_CALLBACK_URI"
+if ! grep "$CONSOLE_CALLBACK_URI" <<< "$CONSOLE_REDIRECT_URIS" > /dev/null; then
+    echo "The URI to remove is not found within the list of redirect uris"
     exit 0
 fi
 CONSOLE_REDIRECT_URIS_NEW="$(echo "$CONSOLE_REDIRECT_URIS" | grep -v "$CONSOLE_CALLBACK_URI" | paste -s -d ' ' -)"
diff --git a/ci-operator/step-registry/idp/external-oidc/keycloak/server/idp-external-oidc-keycloak-server-commands.sh b/ci-operator/step-registry/idp/external-oidc/keycloak/server/idp-external-oidc-keycloak-server-commands.sh
index 19d8e33df99f2..d06f79ed9ceb5 100644
--- a/ci-operator/step-registry/idp/external-oidc/keycloak/server/idp-external-oidc-keycloak-server-commands.sh
+++ b/ci-operator/step-registry/idp/external-oidc/keycloak/server/idp-external-oidc-keycloak-server-commands.sh
@@ -123,6 +123,18 @@ spec:
     oc create secret generic $CONSOLE_CLIENT_SECRET_NAME --from-literal=clientSecret=$CONSOLE_CLIENT_SECRET_VALUE --dry-run=client -o yaml > "$SHARED_DIR"/oidcProviders-secret-configmap.yaml
     echo "---" >> "$SHARED_DIR"/oidcProviders-secret-configmap.yaml
     oc create configmap keycloak-oidc-ca --from-file=ca-bundle.crt=/tmp/router-ca/ca-bundle.crt --dry-run=client -o yaml >> "$SHARED_DIR"/oidcProviders-secret-configmap.yaml
+
+    # Determine if we should include extra and uid claims (considering OCPBUGS-57736 is fixed only in >= 4.20)
+    CLUSTER_VERSION=$(oc get clusterversion version -o jsonpath='{.status.desired.version}' 2>/dev/null || echo "")
+    INCLUDE_EXTRA_UID=false
+    if [ -n "$CLUSTER_VERSION" ]; then
+        OCP_MAJOR=$(echo "$CLUSTER_VERSION" | cut -d. -f1)
+        OCP_MINOR=$(echo "$CLUSTER_VERSION" | cut -d. -f2)
+        if [ "$OCP_MAJOR" -gt 4 ] || ([ "$OCP_MAJOR" -eq 4 ] && [ "$OCP_MINOR" -ge 20 ]); then
+            INCLUDE_EXTRA_UID=true
+        fi
+    fi
+
     # Spaces or symbol characters in below "name" should work, in case of similar bug OCPBUGS-44099 in old IDP area
     # Note, the value examples (e.g. extra's values) used here may be tested and referenced otherwhere.
     # So, when modifying them, search and modify otherwhere too
@@ -131,13 +143,23 @@ spec:
   "oidcProviders": [
     {
       "claimMappings": {
-        "groups": {"claim": "groups", "prefix": "oidc-groups-test:"},
-        "username": {"claim": "email", "prefixPolicy": "Prefix", "prefix": {"prefixString": "oidc-user-test:"}},
+EOF
+
+    # Conditionally add extra and uid fields for OpenShift >= 4.20
+    if [ "$INCLUDE_EXTRA_UID" = "true" ]; then
+        echo "Including extra and uid fields"
+        cat >> "$SHARED_DIR"/oidcProviders.json << EOF
         "extra": [
           {"key": "extratest.openshift.com/foo", "valueExpression": "claims.email"},
           {"key": "extratest.openshift.com/bar", "valueExpression": "\"extra-test-mark\""}
         ],
-        "uid": {"expression": "\"testuid-\" + claims.sub + \"-uidtest\""}
+        "uid": {"expression": "\"testuid-\" + claims.sub + \"-uidtest\""},
+EOF
+    fi
+
+    cat >> "$SHARED_DIR"/oidcProviders.json << EOF
+        "groups": {"claim": "groups", "prefix": "oidc-groups-test:"},
+        "username": {"claim": "email", "prefixPolicy": "Prefix", "prefix": {"prefixString": "oidc-user-test:"}}
       },
       "issuer": {
         "issuerURL": "$ISSUER_URL", "audiences": ["$AUDIENCE_1", "$AUDIENCE_2"],