diff --git a/playbook/roles/keycloak/files/setup-keycloak.sh b/playbook/roles/keycloak/files/setup-keycloak.sh
index abe91c8c..faf8f78d 100644
--- a/playbook/roles/keycloak/files/setup-keycloak.sh
+++ b/playbook/roles/keycloak/files/setup-keycloak.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-export keycloak_db_password=$1
-export keycloak_ui_password=$2
-export domain=$3
-export secret=$4
-export namespace=$5
+export domain=$1
+export secret=$2
+export namespace=$3
+export keycloak_ui_password=$4
+export keycloak_db_password=$5
 
 cat > keycloak-values.yaml << EOF
 postgresql:
diff --git a/playbook/roles/keycloak/tasks/main.yml b/playbook/roles/keycloak/tasks/main.yml
index 0578bace..b2f0f8cf 100755
--- a/playbook/roles/keycloak/tasks/main.yml
+++ b/playbook/roles/keycloak/tasks/main.yml
@@ -12,7 +12,12 @@
 #  debug: var=command_raw verbosity=0
 
 - name: Setup Keycloak Server
-  script: files/setup-keycloak.sh {{ hostvars[groups[group][0]].keycloak_db_password }} {{ admin_password }} {{ domain }} {{ tls.secret_name }} {{ namespace }}
+  script: files/setup-keycloak.sh  \ 
+          {{ domain }}             \ 
+          {{ tls.secret_name }}    \
+          {{ namespace }}          \
+          {{ admin_password }}     \
+          {{ hostvars[groups[group][0]].keycloak_db_password }} 
   when: inventory_hostname in groups[group]
 
 #- name: Sync aws-gloabl-oidc-broker deploy yaml
@@ -20,6 +25,6 @@
 #  with_items:
 #    - aws-gloabl-oidc-broker.yaml
 
-- name: Setup aws-gloabl-oidc-broker
-  shell: "kubectl apply -f /tmp/aws-gloabl-oidc-broker.yaml"
-  when: inventory_hostname in groups[group]
+#- name: Setup aws-gloabl-oidc-broker
+#  shell: "kubectl apply -f /tmp/aws-gloabl-oidc-broker.yaml"
+#  when: inventory_hostname in groups[group]