diff --git a/addons/auto-clustering/auto-cluster.jps b/addons/auto-clustering/auto-cluster.jps
index d3209ef1..a2704557 100644
--- a/addons/auto-clustering/auto-cluster.jps
+++ b/addons/auto-clustering/auto-cluster.jps
@@ -9,7 +9,7 @@ description:
     healthcheck and autodiscovery of newly added DB nodes
   short: Scalable MySQL cluster with ProxySQL for even load distribution
 
-baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
+baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-70722
 
 logo: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/images/mysql-logo.png
 
diff --git a/manifest.yml b/manifest.yml
index d0888f5c..2b18f176 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -16,7 +16,7 @@ logo: /images/mysql-mariadb-percona-logo.png?_r=1
 
 onBeforeInit: /scripts/settings.js?_r=${fn.random}
 
-baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
+baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-70722
 
 settings:
   fields:
diff --git a/scripts/common.yml b/scripts/common.yml
index c2020d00..69498905 100644
--- a/scripts/common.yml
+++ b/scripts/common.yml
@@ -1,4 +1,5 @@
 globals:
+  db_cluster_path: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
   customConfigFile: /etc/mysql/conf.d/my_custom.cnf
   
 actions:
@@ -74,7 +75,7 @@ actions:
 
   setupAdminUser:
     - cmd[${this.id}]: |-
-        wget ${baseUrl}/scripts/setupUser.sh -O ~/setupUser.sh &>> /var/log/run.log;
+        wget ${globals.db_cluster_path}/scripts/setupUser.sh -O ~/setupUser.sh;
         bash ~/setupUser.sh ${globals.DB_USER} ${globals.DB_PASS} &>> /var/log/run.log;
       user: root
 
@@ -87,7 +88,7 @@ actions:
         pswd: ${globals.REPLICA_PSWD}
 
   addCustomConfig:
-    - cmd[sqldb]: wget ${baseUrl}/configs/custom.cnf -O ${globals.customConfigFile} &>> /var/log/run.log;
+    - cmd[sqldb]: wget ${globals.db_cluster_path}/configs/custom.cnf -O ${globals.customConfigFile};
     - env.file.AddFavorite:
       nodeGroup: sqldb
       path: ${globals.customConfigFile}
diff --git a/scripts/galera.jps b/scripts/galera.jps
index 429d85eb..8edd77b1 100644
--- a/scripts/galera.jps
+++ b/scripts/galera.jps
@@ -153,6 +153,7 @@ actions:
         [ -f /var/lib/mysql/galera.cache ] && rm -f /var/lib/mysql/galera.cache
         pgrep mysql 1>/dev/null && pkill -9 mysql;
         pgrep mariadb 1>/dev/null && pkill -9 mariadb || true
+        systemctl reset-failed
       user: root
  
   restartNodesInOrder:
diff --git a/scripts/proxy-common.yml b/scripts/proxy-common.yml
index abe1d32b..dda8f914 100644
--- a/scripts/proxy-common.yml
+++ b/scripts/proxy-common.yml
@@ -1,3 +1,6 @@
+globals:
+  db_cluster_path: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
+
 actions:
   setupOrchestrator:
     - log: Orchestrator configuration
@@ -11,7 +14,7 @@ actions:
           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
+        wget ${globals.db_cluster_path}/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
         sed -i -e 's|orc_server_user|admin|g' /etc/orchestrator.conf.json
diff --git a/scripts/xtradb.jps b/scripts/xtradb.jps
index 1bb1b995..19e6c37c 100644
--- a/scripts/xtradb.jps
+++ b/scripts/xtradb.jps
@@ -134,6 +134,7 @@ actions:
         [ -f /var/lib/mysql/galera.cache ] && rm -f /var/lib/mysql/galera.cache
         pgrep mysql 1>/dev/null && pkill -9 mysql;
         pgrep mariadb 1>/dev/null && pkill -9 mariadb || true
+        systemctl reset-failed
       user: root
  
   restartNodesInOrder: