diff --git a/addons/auto-clustering/auto-cluster.jps b/addons/auto-clustering/auto-cluster.jps
index be3bba67..bc842dd4 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/sych74/mysql-cluster/JE-59466-new
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster
 
 logo: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/images/mysql-logo.png
 
diff --git a/manifest.yml b/manifest.yml
index c9364e92..2c7d3e52 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -7,6 +7,7 @@ categories:
   - apps/clustered-dbs
   - apps/popular
   - apps/clusters
+  - apps/databases
   
 description: 
   text: "/texts/description.md?_r=1"
@@ -16,7 +17,7 @@ logo: /images/mysql-mariadb-percona-logo.png?_r=1
 
 onBeforeInit: /scripts/settings.js?_r=${fn.random}
 
-baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-59466-new
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster
 
 settings:
   fields:
diff --git a/scripts/common.yml b/scripts/common.yml
index ce22ac0d..c3509004 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/stage-cluster
   customConfigFile: /etc/mysql/conf.d/my_custom.cnf
   
 actions:
diff --git a/scripts/galera.jps b/scripts/galera.jps
index 429d85eb..5fab6d73 100644
--- a/scripts/galera.jps
+++ b/scripts/galera.jps
@@ -151,6 +151,7 @@ actions:
         [ -f /var/lib/mysql/grastate.dat ] && rm -f /var/lib/mysql/grastate.dat
         [ -f /var/lib/mysql/gvwstate.dat ] && rm -f /var/lib/mysql/gvwstate.dat
         [ -f /var/lib/mysql/galera.cache ] && rm -f /var/lib/mysql/galera.cache
+        [ -f /var/lib/mysql/tc.log ] && rm -f /var/lib/mysql/tc.log
         pgrep mysql 1>/dev/null && pkill -9 mysql;
         pgrep mariadb 1>/dev/null && pkill -9 mariadb || true
       user: root
diff --git a/scripts/master-master.jps b/scripts/master-master.jps
index b6d98bf4..ccc4f913 100644
--- a/scripts/master-master.jps
+++ b/scripts/master-master.jps
@@ -3,7 +3,7 @@ id: mysql-master-master-replication-cluster
 name: MySQL/MariaDB/Percona Primary-Primary Replication Database Cluster
 description: 'DB Auto Clustering: 1 x Primary + N x Secondary'
 
-baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-59466-new
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster
 
 success:
    text: /texts/phpmyadmin-credentials.md
diff --git a/scripts/master-slave.jps b/scripts/master-slave.jps
index 8e6d55ec..ca4bf53b 100644
--- a/scripts/master-slave.jps
+++ b/scripts/master-slave.jps
@@ -3,7 +3,7 @@ id: mysql-master-slave-replication-cluster
 name: MySQL/MariaDB/Percona Primary-Secondary Replication Database Cluster
 description: 'DB Auto Clustering: 1 x Primary + N x Secondary'
 
-baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-59466-new
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster
 
 success:
   text: /texts/phpmyadmin-credentials.md
diff --git a/scripts/proxy-galera.jps b/scripts/proxy-galera.jps
index dbb2d883..a16f6f3f 100644
--- a/scripts/proxy-galera.jps
+++ b/scripts/proxy-galera.jps
@@ -50,16 +50,6 @@ onAfterClone:
       db_user: ${globals.DB_USER}
       db_pass: ${globals.DB_PASS}
 
-onBeforeRemoveNode[proxy]:
-  stopEvent:
-    type: warning
-    message: Scaling is not supported for ProxySQL.
-
-onBeforeAddNode[proxy]:
-  stopEvent:
-    type: warning
-    message: Scaling is not supported for ProxySQL.
-
 onInstall:
   - getReplicaUser
   - resetProxyNodes
diff --git a/scripts/proxy-master-slave.jps b/scripts/proxy-master-slave.jps
index 885c2366..2093b200 100644
--- a/scripts/proxy-master-slave.jps
+++ b/scripts/proxy-master-slave.jps
@@ -23,16 +23,6 @@ globals:
   ADMIN_USER: admin-${fn.random}
   ADMIN_PASS: ${fn.password(10)}
   MAX_REPL_LAG: 20
-  
-onBeforeRemoveNode[proxy]:
-  stopEvent:
-    type: warning
-    message: Scaling is not supported for ProxySQL.
-
-onBeforeAddNode[proxy]:
-  stopEvent:
-    type: warning
-    message: Scaling is not supported for ProxySQL.
 
 onAfterScaleOut[sqldb]:
   forEach(event.response.nodes):
diff --git a/scripts/xtradb.jps b/scripts/xtradb.jps
index 1bb1b995..ebe634eb 100644
--- a/scripts/xtradb.jps
+++ b/scripts/xtradb.jps
@@ -132,6 +132,7 @@ actions:
         [ -f /var/lib/mysql/grastate.dat ] && rm -f /var/lib/mysql/grastate.dat
         [ -f /var/lib/mysql/gvwstate.dat ] && rm -f /var/lib/mysql/gvwstate.dat
         [ -f /var/lib/mysql/galera.cache ] && rm -f /var/lib/mysql/galera.cache
+        [ -f /var/lib/mysql/tc.log ] && rm -f /var/lib/mysql/tc.log
         pgrep mysql 1>/dev/null && pkill -9 mysql;
         pgrep mariadb 1>/dev/null && pkill -9 mariadb || true
       user: root