diff --git a/addons/auto-clustering/auto-cluster.jps b/addons/auto-clustering/auto-cluster.jps
index bc842dd4..d3209ef1 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/stage-cluster
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
 
 logo: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/images/mysql-logo.png
 
diff --git a/addons/auto-clustering/scripts/auto-cluster-logic.jps b/addons/auto-clustering/scripts/auto-cluster-logic.jps
index 6979d1d0..699a2c7f 100644
--- a/addons/auto-clustering/scripts/auto-cluster-logic.jps
+++ b/addons/auto-clustering/scripts/auto-cluster-logic.jps
@@ -41,14 +41,14 @@ onInstall:
         SCHEME: ${settings.scheme}
 
   - install:
-      jps: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-addon/addons/recovery/manifest.yml?_r=${fn.random}
+      jps: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/addons/recovery/manifest.yml?_r=${fn.random}
       nodeGroup: sqldb
       targetNodes: sqldb
       settings:
         install: true
  
   - install: 
-      jps: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-addon/addons/check-corrupts/manifest.yml?_r=${fn.random}
+      jps: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/addons/check-corrupts/manifest.yml?_r=${fn.random}
       nodeGroup: sqldb
       targetNodes: sqldb
       settings:
diff --git a/manifest.yml b/manifest.yml
index 2c7d3e52..8a86271a 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/stage-cluster
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
 
 settings:
   fields:
diff --git a/scripts/common.yml b/scripts/common.yml
index d042fa30..12a842c4 100644
--- a/scripts/common.yml
+++ b/scripts/common.yml
@@ -1,5 +1,5 @@
 globals:
-  db_cluster_path: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster
+  db_cluster_path: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
   customConfigFile: /etc/mysql/conf.d/my_custom.cnf
   
 actions:
diff --git a/scripts/galera.jps b/scripts/galera.jps
index deb007a0..5fab6d73 100644
--- a/scripts/galera.jps
+++ b/scripts/galera.jps
@@ -3,7 +3,7 @@ id: mysql-galera-cluster
 name: MariaDB Galera Cluster
 description: MariaDB Galera Auto Clustering
 
-baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
 
 success:
   text: /texts/phpmyadmin-credentials.md
diff --git a/scripts/master-master.jps b/scripts/master-master.jps
index 7134999d..50d42f8c 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/stage-cluster
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
 
 success:
    text: /texts/phpmyadmin-credentials.md
@@ -108,7 +108,7 @@ actions:
     
   setupPrimaryPrimaryReplication:
     - cmd[${globals.primary2_id}]: |-
-        curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-addon/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh;
+        curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh;
         bash /tmp/db-recovery.sh  --scenario restore_primary_from_primary --donor-ip ${globals.primary1_ip};
       user: root
   
@@ -143,6 +143,6 @@ actions:
 
   setupSecondaryReplication:
     - cmd[${this}]: |-
-        curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-addon/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh;
+        curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh;
         bash /tmp/db-recovery.sh  --scenario restore_secondary_from_primary --donor-ip ${globals.primary1_ip} --additional-primary ${globals.primary2_ip};
       user: root
diff --git a/scripts/master-slave.jps b/scripts/master-slave.jps
index 47272fde..a9e36c27 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/stage-cluster
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
 
 success:
   text: /texts/phpmyadmin-credentials.md
@@ -107,6 +107,6 @@ actions:
       - setGlobals:
           PRIMARY_IP: ${nodes.sqldb.master.address}
     - cmd[${this}]: |-
-        curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-addon/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh; 
+        curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh; 
         bash /tmp/db-recovery.sh --scenario restore_secondary_from_primary --donor-ip ${globals.PRIMARY_IP};
       user: root
diff --git a/scripts/proxy-common.yml b/scripts/proxy-common.yml
index c3f5ee2a..43261979 100644
--- a/scripts/proxy-common.yml
+++ b/scripts/proxy-common.yml
@@ -1,5 +1,5 @@
 globals:
-  db_cluster_path: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster
+  db_cluster_path: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
   proxy_web_port: 4848
 
 actions:
diff --git a/scripts/proxy-master-slave.jps b/scripts/proxy-master-slave.jps
index 226d0dd3..788272c6 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/jelastic-jps/mysql-cluster/stage-cluster
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
 
 success: /texts/proxy-entrypoint.md
 
diff --git a/scripts/xtradb.jps b/scripts/xtradb.jps
index 9a6c1117..ebe634eb 100644
--- a/scripts/xtradb.jps
+++ b/scripts/xtradb.jps
@@ -3,7 +3,7 @@ id: percona-xtradb-cluster
 name: Percona XtraDB Cluster
 description: Percona XtraDB Auto Clustering
 
-baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
 
 success:
   text: /texts/phpmyadmin-credentials.md