diff --git a/setup.sh b/setup.sh
index fcde485..f79cbec 100644
--- a/setup.sh
+++ b/setup.sh
@@ -10,10 +10,11 @@ else
     KEYCLOAK_PW=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
     ODC_DB_PW=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
     KEYCLOAK_ADMIN_PW=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
-    NEW_UUID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
+    OAUTH_KEYCLOAK_CLIENT_ID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
+
     echo "KEYCLOAK_PW=$KEYCLOAK_PW" >> $FILE
     echo "KEYCLOAK_ADMIN_PW=$KEYCLOAK_ADMIN_PW" >> $FILE
-    echo "NEW_UUID=$NEW_UUID" >> $FILE
+    echo "OAUTH_KEYCLOAK_CLIENT_ID=$OAUTH_KEYCLOAK_CLIENT_ID" >> $FILE
     echo "ODC_DB_PW=$ODC_DB_PW" >> $FILE
     source $FILE
 fi
@@ -40,7 +41,7 @@ echo ------------------------------------------------------------
 echo ----------------- Build the Keycloak -----------------------
 echo ------------------------------------------------------------
 
-sed -i "s|<clientsecret>|$NEW_UUID|g" keycloak/realm-export.json
+sed -i "s|<clientsecret>|$OAUTH_KEYCLOAK_CLIENT_ID|g" keycloak/realm-export.json
 sed -i "s|<clientUrl>|$HTTP_METHOD://$PUBLIC_URL|g" keycloak/realm-export.json
 
 echo ------------------------------------------------------------