diff --git a/test/scripts/ephe-domains-register.sh b/test/scripts/ephe-domains-register.sh
index ad60a7442..546c505b1 100755
--- a/test/scripts/ephe-domains-register.sh
+++ b/test/scripts/ephe-domains-register.sh
@@ -10,6 +10,9 @@ function error {
 
 TOKEN="$1"
 [ "${TOKEN}" != "" ] || error "TOKEN is empty"
+ORG_ID="$2"
+[ "${ORG_ID}" != "" ] || error "ORG_ID is empty"
+
 
 export NAMESPACE="$(oc project -q)"
 CREDS="$( oc get secrets/env-${NAMESPACE}-keycloak -o jsonpath='{.data.defaultUsername}' | base64 -d )"
@@ -17,7 +20,7 @@ CREDS="${CREDS}:$( oc get secrets/env-${NAMESPACE}-keycloak -o jsonpath='{.data.
 export CREDS
 
 unset X_RH_IDENTITY
-export X_RH_FAKE_IDENTITY="$( ./tools/bin/xrhidgen -org-id 12345 system -cn "6f324116-b3d2-11ed-8a37-482ae3863d30" -cert-type system | base64 -w0 )"
+export X_RH_FAKE_IDENTITY="$( ./tools/bin/xrhidgen -org-id "${ORG_ID}" system -cn "6f324116-b3d2-11ed-8a37-482ae3863d30" -cert-type system | base64 -w0 )"
 export X_RH_IDM_REGISTRATION_TOKEN="${TOKEN}"
 export X_RH_IDM_VERSION='{"ipa-hcc": "0.9", "ipa": "4.10.0-8.el9_1", "os-release-id": "rhel", "os-release-version-id": "9.1"}'
 BASE_URL="https://$( oc get routes -l app=idmsvc-backend -o jsonpath='{.items[0].spec.host}' )/api/idmsvc/v1"
diff --git a/test/scripts/local-domains-register.sh b/test/scripts/local-domains-register.sh
index ff780fbcd..0f7720e8e 100755
--- a/test/scripts/local-domains-register.sh
+++ b/test/scripts/local-domains-register.sh
@@ -10,8 +10,10 @@ function error {
 
 TOKEN="$1"
 [ "${TOKEN}" != "" ] || error "TOKEN is empty"
+ORG_ID="$2"
+[ "${ORG_ID}" != "" ] || error "ORG_ID is empty"
 
-export X_RH_IDENTITY="$( ./tools/bin/xrhidgen -org-id 12345 system -cn "6f324116-b3d2-11ed-8a37-482ae3863d30" -cert-type system | base64 -w0 )"
+export X_RH_IDENTITY="$( ./tools/bin/xrhidgen -org-id "${ORG_ID}" system -cn "6f324116-b3d2-11ed-8a37-482ae3863d30" -cert-type system | base64 -w0 )"
 unset CREDS
 export X_RH_IDM_REGISTRATION_TOKEN="$TOKEN"
 export X_RH_IDM_VERSION='{"ipa-hcc": "0.9", "ipa": "4.10.0-8.el9_1", "os-release-id": "rhel", "os-release-version-id": "9.1"}'