diff --git a/scripts/proxy-common.yml b/scripts/proxy-common.yml
index 7d6972bf..abe1d32b 100644
--- a/scripts/proxy-common.yml
+++ b/scripts/proxy-common.yml
@@ -4,7 +4,13 @@ actions:
     - cmd [proxy]: |-
         mysql -h 127.0.0.1 -P3360 -uroot -e "DROP DATABASE IF EXISTS orchestrator;"
         mysql -h 127.0.0.1 -P3360 -uroot -e "CREATE DATABASE IF NOT EXISTS orchestrator;"
-        mysql -h 127.0.0.1 -P3360 -uroot -e "GRANT ALL PRIVILEGES ON orchestrator.* TO 'admin'@'127.0.0.1' IDENTIFIED BY '${globals.ORCH_PASS}';"
+        major_version=$(rpm -qi mysql-community-server | grep Version | awk '{print $3}' | awk -F'.' '{print $1}');
+        if [ $major_version -ge 8 ]; then
+          mysql -h 127.0.0.1 -P3360 -uroot -e "ALTER USER 'admin'@'127.0.0.1' IDENTIFIED BY '${globals.ORCH_PASS}';"
+        else
+          mysql -h 127.0.0.1 -P3360 -uroot -e "SET PASSWORD FOR 'admin'@'127.0.0.1' = PASSWORD('${globals.ORCH_PASS}');"
+        fi
+        mysql -h 127.0.0.1 -P3360 -uroot -e "FLUSH PRIVILEGES;"
         wget ${baseUrl}/configs/orchestrator.conf.json -O /etc/orchestrator.conf.json &>> /var/log/run.log
         sed -i -e 's|orc_client_user|${globals.DB_USER}|g' /etc/orchestrator.conf.json
         sed -i -e 's|orc_client_password|${globals.DB_PASS}|g' /etc/orchestrator.conf.json
diff --git a/scripts/proxy-galera.jps b/scripts/proxy-galera.jps
index b633bc4c..e5fdcba2 100644
--- a/scripts/proxy-galera.jps
+++ b/scripts/proxy-galera.jps
@@ -3,7 +3,7 @@ id: mysql-proxy-galera-cluster
 name: Galera/XtraDB Cluster with ProxySQL
 description: Galera/XtraDB Cluster
 
-baseUrl: https://raw.githubusercontent.com/dimkadt/mysql-cluster/v3.0.0
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster
 
 success: /texts/proxy-entrypoint.md
 
diff --git a/scripts/proxy-master-slave.jps b/scripts/proxy-master-slave.jps
index e841e002..d89b97de 100644
--- a/scripts/proxy-master-slave.jps
+++ b/scripts/proxy-master-slave.jps
@@ -3,7 +3,7 @@ id: mysql-proxy-master-slave-cluster
 name: MySQL/MariaDB/Percona Database Cluster with ProxySQL
 description: ProxySQL Load Balancer Entry Point
 
-baseUrl: https://raw.githubusercontent.com/dimkadt/mysql-cluster/v3.0.0
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster
 
 success: /texts/proxy-entrypoint.md