diff --git a/addons/auto-clustering/auto-cluster.jps b/addons/auto-clustering/auto-cluster.jps
index d3209ef1..d5498d82 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-73464
 
 logo: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/images/mysql-logo.png
 
diff --git a/configs/master.cnf b/configs/master.cnf
index d63f75ef..b18dd112 100644
--- a/configs/master.cnf
+++ b/configs/master.cnf
@@ -11,6 +11,5 @@ relay-log = /var/lib/mysql/mysql-relay-bin
 relay-log-index = /var/lib/mysql/mysql-relay-bin.index
 replicate-wild-ignore-table = performance_schema.%
 replicate-wild-ignore-table = information_schema.%
-replicate-wild-ignore-table = mysql.%
 read_only = 0
 report_host =
diff --git a/configs/slave.cnf b/configs/slave.cnf
index 1aff20e6..5af14e07 100644
--- a/configs/slave.cnf
+++ b/configs/slave.cnf
@@ -5,6 +5,5 @@ relay-log = /var/lib/mysql/mysql-relay-bin
 relay-log-index = /var/lib/mysql/mysql-relay-bin.index
 replicate-wild-ignore-table = performance_schema.%
 replicate-wild-ignore-table = information_schema.%
-replicate-wild-ignore-table = mysql.%
 read_only = 1
 report_host =
diff --git a/manifest.yml b/manifest.yml
index 8a86271a..68203adf 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -17,7 +17,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-73464
 
 settings:
   fields:
diff --git a/scripts/master-master.jps b/scripts/master-master.jps
index 50d42f8c..80385c5f 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/jelastic-jps/mysql-cluster/v3.0.0
+baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-73464
 
 success:
    text: /texts/phpmyadmin-credentials.md
diff --git a/scripts/master-slave.jps b/scripts/master-slave.jps
index a9e36c27..8af1d8c1 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/jelastic-jps/mysql-cluster/v3.0.0
+baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-73464
 
 success:
   text: /texts/phpmyadmin-credentials.md