diff --git a/abbreviations/abbreviations.go b/abbreviations/abbreviations.go
index ba2a5b03..d8595f2e 100644
--- a/abbreviations/abbreviations.go
+++ b/abbreviations/abbreviations.go
@@ -17,7 +17,7 @@ package abbreviations
 
 import (
 	"fmt"
-	"github.com/datacharmer/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/common"
 	"os"
 	"regexp"
 	"strings"
diff --git a/abbreviations/abbreviations_test.go b/abbreviations/abbreviations_test.go
index 537f447e..caca5ffc 100644
--- a/abbreviations/abbreviations_test.go
+++ b/abbreviations/abbreviations_test.go
@@ -16,8 +16,8 @@
 package abbreviations
 
 import (
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/compare"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/compare"
 	"os"
 	"testing"
 )
diff --git a/cmd/admin.go b/cmd/admin.go
index 11aa737f..03a2569d 100644
--- a/cmd/admin.go
+++ b/cmd/admin.go
@@ -17,14 +17,14 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/datacharmer/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/defaults"
 	"os"
 	"path"
 	"sort"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/sandbox"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/sandbox"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/admin_default_sandbox.go b/cmd/admin_default_sandbox.go
index c3b0691d..97da4501 100644
--- a/cmd/admin_default_sandbox.go
+++ b/cmd/admin_default_sandbox.go
@@ -23,9 +23,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 var defaultsExecutableTemplate = `#!{{.ShellPath}}
diff --git a/cmd/cookbook.go b/cmd/cookbook.go
index d4dfd918..5de441fe 100644
--- a/cmd/cookbook.go
+++ b/cmd/cookbook.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/datacharmer/dbdeployer/cookbook"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/cookbook"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/data_load.go b/cmd/data_load.go
index f0f9e84c..de1095f9 100644
--- a/cmd/data_load.go
+++ b/cmd/data_load.go
@@ -23,10 +23,10 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/data_load"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/data_load"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 func listArchives(cmd *cobra.Command, args []string) error {
diff --git a/cmd/defaults.go b/cmd/defaults.go
index edaa38aa..d133d459 100644
--- a/cmd/defaults.go
+++ b/cmd/defaults.go
@@ -20,13 +20,13 @@ import (
 	"regexp"
 
 	"github.com/alexeyco/simpletable"
-	"github.com/datacharmer/dbdeployer/ops"
+	"github.com/ProxySQL/dbdeployer/ops"
 
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"github.com/spf13/cobra"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
 )
 
 func showDefaults(cmd *cobra.Command, args []string) {
diff --git a/cmd/delete.go b/cmd/delete.go
index 847026b8..bbf90474 100644
--- a/cmd/delete.go
+++ b/cmd/delete.go
@@ -21,11 +21,11 @@ import (
 	"os"
 	"path"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/concurrent"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/sandbox"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/concurrent"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/sandbox"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/delete_binaries.go b/cmd/delete_binaries.go
index b6a77b3b..eec6b764 100644
--- a/cmd/delete_binaries.go
+++ b/cmd/delete_binaries.go
@@ -17,9 +17,9 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/ops"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/ops"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/deploy.go b/cmd/deploy.go
index 2d265ed6..d97cb09b 100644
--- a/cmd/deploy.go
+++ b/cmd/deploy.go
@@ -21,9 +21,9 @@ import (
 	"os"
 	"path"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/downloads.go b/cmd/downloads.go
index bcd9d4e0..1da30503 100644
--- a/cmd/downloads.go
+++ b/cmd/downloads.go
@@ -28,12 +28,12 @@ import (
 	"time"
 
 	"github.com/alexeyco/simpletable"
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/downloads"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/ops"
-	"github.com/datacharmer/dbdeployer/rest"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/downloads"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/ops"
+	"github.com/ProxySQL/dbdeployer/rest"
 	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/export.go b/cmd/export.go
index 1d48da30..f4b63433 100644
--- a/cmd/export.go
+++ b/cmd/export.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"golang.org/x/term"
diff --git a/cmd/export_test.go b/cmd/export_test.go
index e45e40bf..d462c045 100644
--- a/cmd/export_test.go
+++ b/cmd/export_test.go
@@ -18,11 +18,11 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"testing"
 
-	"github.com/datacharmer/dbdeployer/compare"
+	"github.com/ProxySQL/dbdeployer/compare"
 )
 
 func TestExport(t *testing.T) {
diff --git a/cmd/global.go b/cmd/global.go
index be14c912..c3931191 100644
--- a/cmd/global.go
+++ b/cmd/global.go
@@ -22,8 +22,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/import.go b/cmd/import.go
index bab4bd9f..e76cc33b 100644
--- a/cmd/import.go
+++ b/cmd/import.go
@@ -22,11 +22,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/importing"
-	"github.com/datacharmer/dbdeployer/sandbox"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/importing"
+	"github.com/ProxySQL/dbdeployer/sandbox"
 )
 
 func importSingleSandbox(cmd *cobra.Command, args []string) {
diff --git a/cmd/info.go b/cmd/info.go
index fac40706..0bff91c0 100644
--- a/cmd/info.go
+++ b/cmd/info.go
@@ -24,10 +24,10 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/rest"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/rest"
 )
 
 func displayDefaults(cmd *cobra.Command, args []string) {
diff --git a/cmd/init.go b/cmd/init.go
index 59825a67..50121b23 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -16,10 +16,10 @@
 package cmd
 
 import (
-	"github.com/datacharmer/dbdeployer/ops"
+	"github.com/ProxySQL/dbdeployer/ops"
 	"github.com/spf13/cobra"
 
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 func initEnvironment(cmd *cobra.Command, args []string) error {
diff --git a/cmd/multiple.go b/cmd/multiple.go
index 6b6d360a..211f5637 100644
--- a/cmd/multiple.go
+++ b/cmd/multiple.go
@@ -16,9 +16,9 @@
 package cmd
 
 import (
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/sandbox"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/sandbox"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/remote.go b/cmd/remote.go
index 6000edfd..2e1b56ef 100644
--- a/cmd/remote.go
+++ b/cmd/remote.go
@@ -23,9 +23,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/rest"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/rest"
 )
 
 func listRemoteFiles(cmd *cobra.Command, args []string) {
diff --git a/cmd/replication.go b/cmd/replication.go
index 1fa2fa76..ce61c62d 100644
--- a/cmd/replication.go
+++ b/cmd/replication.go
@@ -16,9 +16,9 @@
 package cmd
 
 import (
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/sandbox"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/sandbox"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/root.go b/cmd/root.go
index ff06e495..ad6ec970 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -23,11 +23,11 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/downloads"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/sandbox"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/downloads"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/sandbox"
 )
 
 // rootCmd represents the base command when called without any subcommands
diff --git a/cmd/sandboxes.go b/cmd/sandboxes.go
index a434a99b..ef1987a9 100644
--- a/cmd/sandboxes.go
+++ b/cmd/sandboxes.go
@@ -24,9 +24,9 @@ import (
 	"github.com/araddon/dateparse"
 	"github.com/spf13/cobra"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 func showSandboxesFromCatalog(currentSandboxHome string, useFlavor, useHeader, useTable bool) {
diff --git a/cmd/single.go b/cmd/single.go
index 378bcdcc..7df4cc2c 100644
--- a/cmd/single.go
+++ b/cmd/single.go
@@ -22,10 +22,10 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/sandbox"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/sandbox"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/templates.go b/cmd/templates.go
index 52ae4f68..7ae6133e 100644
--- a/cmd/templates.go
+++ b/cmd/templates.go
@@ -21,10 +21,10 @@ import (
 	"path"
 	"strings"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/sandbox"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/sandbox"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/tree.go b/cmd/tree.go
index 90114e3e..51d8ba42 100644
--- a/cmd/tree.go
+++ b/cmd/tree.go
@@ -25,8 +25,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 func writeApi(showHidden bool) {
diff --git a/cmd/unpack.go b/cmd/unpack.go
index c96718a4..191901e3 100644
--- a/cmd/unpack.go
+++ b/cmd/unpack.go
@@ -18,11 +18,11 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/datacharmer/dbdeployer/ops"
+	"github.com/ProxySQL/dbdeployer/ops"
 	"github.com/spf13/cobra"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 func unpackTarball(cmd *cobra.Command, args []string) {
diff --git a/cmd/update.go b/cmd/update.go
index f7bed6f0..491e554c 100644
--- a/cmd/update.go
+++ b/cmd/update.go
@@ -26,10 +26,10 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/rest"
-	"github.com/datacharmer/dbdeployer/unpack"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/rest"
+	"github.com/ProxySQL/dbdeployer/unpack"
 )
 
 func updateDbDeployer(cmd *cobra.Command, args []string) {
diff --git a/cmd/use.go b/cmd/use.go
index 12508f19..b4001744 100644
--- a/cmd/use.go
+++ b/cmd/use.go
@@ -25,8 +25,8 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 func runInteractiveCmd(s string) error {
diff --git a/cmd/versions.go b/cmd/versions.go
index 0b254e75..32e6a77a 100644
--- a/cmd/versions.go
+++ b/cmd/versions.go
@@ -16,10 +16,10 @@
 package cmd
 
 import (
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/ops"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/ops"
 
-	"github.com/datacharmer/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/common"
 	"github.com/spf13/cobra"
 )
 
diff --git a/common/capabilities.go b/common/capabilities.go
index 31a2742c..aa46f8d2 100644
--- a/common/capabilities.go
+++ b/common/capabilities.go
@@ -14,7 +14,7 @@
 // limitations under the License.
 package common
 
-import "github.com/datacharmer/dbdeployer/globals"
+import "github.com/ProxySQL/dbdeployer/globals"
 
 // Capability defines a feature availability
 type Capability struct {
diff --git a/common/capabilities_test.go b/common/capabilities_test.go
index 624ecc14..8c61d11c 100644
--- a/common/capabilities_test.go
+++ b/common/capabilities_test.go
@@ -16,7 +16,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/datacharmer/dbdeployer/compare"
+	"github.com/ProxySQL/dbdeployer/compare"
 	"testing"
 )
 
diff --git a/common/checks.go b/common/checks.go
index 96aca32b..ac2ea307 100644
--- a/common/checks.go
+++ b/common/checks.go
@@ -30,7 +30,7 @@ import (
 	"github.com/araddon/dateparse"
 	"github.com/pkg/errors"
 
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 type SandboxInfo struct {
diff --git a/common/checks_test.go b/common/checks_test.go
index 5c76e120..395cc789 100644
--- a/common/checks_test.go
+++ b/common/checks_test.go
@@ -17,7 +17,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/datacharmer/dbdeployer/compare"
+	"github.com/ProxySQL/dbdeployer/compare"
 	"testing"
 )
 
diff --git a/common/fileutil.go b/common/fileutil.go
index 4923a1c6..2bffed42 100644
--- a/common/fileutil.go
+++ b/common/fileutil.go
@@ -37,7 +37,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 type SandboxUser struct {
diff --git a/common/fileutil_test.go b/common/fileutil_test.go
index d817ed50..81758b84 100644
--- a/common/fileutil_test.go
+++ b/common/fileutil_test.go
@@ -25,8 +25,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/datacharmer/dbdeployer/compare"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/compare"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 func TestLogDirName(t *testing.T) {
diff --git a/common/stack_test.go b/common/stack_test.go
index 112cc57f..7a28c54e 100644
--- a/common/stack_test.go
+++ b/common/stack_test.go
@@ -17,7 +17,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/datacharmer/dbdeployer/compare"
+	"github.com/ProxySQL/dbdeployer/compare"
 	"testing"
 )
 
diff --git a/common/strutils.go b/common/strutils.go
index fc719af1..fd505f99 100644
--- a/common/strutils.go
+++ b/common/strutils.go
@@ -23,7 +23,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 type CleanupFunc func(target string)
diff --git a/common/strutils_test.go b/common/strutils_test.go
index c8f49716..e1f68f96 100644
--- a/common/strutils_test.go
+++ b/common/strutils_test.go
@@ -17,8 +17,8 @@ package common
 
 import (
 	"fmt"
-	"github.com/datacharmer/dbdeployer/compare"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/compare"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"os"
 	"strings"
 	"testing"
diff --git a/common/tprintf.go b/common/tprintf.go
index 4dd9248d..ccc9cfd5 100644
--- a/common/tprintf.go
+++ b/common/tprintf.go
@@ -24,7 +24,7 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 // StringMap defines the map of variable types, for brevity
diff --git a/common/tprintf_test.go b/common/tprintf_test.go
index 87e70241..5c34a488 100644
--- a/common/tprintf_test.go
+++ b/common/tprintf_test.go
@@ -17,8 +17,8 @@ package common
 
 import (
 	"fmt"
-	"github.com/datacharmer/dbdeployer/compare"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/compare"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"testing"
 )
 
diff --git a/common/version_test.go b/common/version_test.go
index 40f14f23..d42613c9 100644
--- a/common/version_test.go
+++ b/common/version_test.go
@@ -18,8 +18,8 @@ package common
 import (
 	"testing"
 
-	"github.com/datacharmer/dbdeployer/compare"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/compare"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 type versionPort struct {
diff --git a/concurrent/concurrent.go b/concurrent/concurrent.go
index 81effe21..b3d18b62 100644
--- a/concurrent/concurrent.go
+++ b/concurrent/concurrent.go
@@ -21,8 +21,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
 )
 
 type CommonChan chan *exec.Cmd
diff --git a/cookbook/cookbook_templates.go b/cookbook/cookbook_templates.go
index 9bd1dca3..f1dfc92b 100644
--- a/cookbook/cookbook_templates.go
+++ b/cookbook/cookbook_templates.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/datacharmer/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/common"
 )
 
 type RecipeTemplate struct {
diff --git a/cookbook/recipes.go b/cookbook/recipes.go
index fa354033..0d85266b 100644
--- a/cookbook/recipes.go
+++ b/cookbook/recipes.go
@@ -24,9 +24,9 @@ import (
 
 	"github.com/alexeyco/simpletable"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 var (
diff --git a/cookbook/recipes_test.go b/cookbook/recipes_test.go
index 3431cbb1..22d13672 100644
--- a/cookbook/recipes_test.go
+++ b/cookbook/recipes_test.go
@@ -18,10 +18,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/compare"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/sandbox"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/compare"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/sandbox"
 )
 
 func TestGetLatestVersion(t *testing.T) {
diff --git a/data_load/data_load.go b/data_load/data_load.go
index 4fe1d35a..24d0e6ac 100644
--- a/data_load/data_load.go
+++ b/data_load/data_load.go
@@ -25,11 +25,11 @@ import (
 
 	"github.com/dustin/go-humanize"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/rest"
-	"github.com/datacharmer/dbdeployer/unpack"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/rest"
+	"github.com/ProxySQL/dbdeployer/unpack"
 )
 
 type DataDefinition struct {
diff --git a/defaults/catalog.go b/defaults/catalog.go
index 75b78516..761a81e9 100644
--- a/defaults/catalog.go
+++ b/defaults/catalog.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/nightlyone/lockfile"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 type SandboxItem struct {
diff --git a/defaults/defaults.go b/defaults/defaults.go
index 45660d71..95eea806 100644
--- a/defaults/defaults.go
+++ b/defaults/defaults.go
@@ -21,8 +21,8 @@ import (
 	"path"
 	"time"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 type DbdeployerDefaults struct {
diff --git a/defaults/logging.go b/defaults/logging.go
index 3ea68469..43c1cece 100644
--- a/defaults/logging.go
+++ b/defaults/logging.go
@@ -23,8 +23,8 @@ import (
 	"runtime"
 	"sync"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 type Logger struct {
diff --git a/docs/coding/minimal-sandbox.go b/docs/coding/minimal-sandbox.go
index d451e809..00d2456f 100644
--- a/docs/coding/minimal-sandbox.go
+++ b/docs/coding/minimal-sandbox.go
@@ -22,10 +22,10 @@
 package main
 
 import (
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/sandbox"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/sandbox"
 	"os"
 	"path"
 )
diff --git a/docs/coding/minimal-sandbox2.go b/docs/coding/minimal-sandbox2.go
index 5738efd8..72039bfc 100644
--- a/docs/coding/minimal-sandbox2.go
+++ b/docs/coding/minimal-sandbox2.go
@@ -25,10 +25,10 @@ import (
 	"os"
 	"path"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/sandbox"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/sandbox"
 )
 
 func main() {
diff --git a/downloads/remote_registry.go b/downloads/remote_registry.go
index 0678e5db..0d4a0afe 100644
--- a/downloads/remote_registry.go
+++ b/downloads/remote_registry.go
@@ -28,9 +28,9 @@ import (
 	"strings"
 
 	"github.com/araddon/dateparse"
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 )
diff --git a/downloads/remote_registry_test.go b/downloads/remote_registry_test.go
index 16ece648..0c5a0862 100644
--- a/downloads/remote_registry_test.go
+++ b/downloads/remote_registry_test.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/compare"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/compare"
 )
 
 type boolMap map[bool]string
diff --git a/downloads/remote_tarballs.go b/downloads/remote_tarballs.go
index 3befc734..cfc259a3 100644
--- a/downloads/remote_tarballs.go
+++ b/downloads/remote_tarballs.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/datacharmer/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/common"
 	"jaytaylor.com/html2text"
 )
 
diff --git a/go.mod b/go.mod
index 8d310685..51dfb8a0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/datacharmer/dbdeployer
+module github.com/ProxySQL/dbdeployer
 
 go 1.22
 
diff --git a/main.go b/main.go
index c83227a5..f6dd3f6e 100644
--- a/main.go
+++ b/main.go
@@ -18,8 +18,8 @@ package main
 import (
 	"os"
 
-	"github.com/datacharmer/dbdeployer/abbreviations"
-	"github.com/datacharmer/dbdeployer/cmd"
+	"github.com/ProxySQL/dbdeployer/abbreviations"
+	"github.com/ProxySQL/dbdeployer/cmd"
 )
 
 func main() {
diff --git a/mkreadme/make_readme.go b/mkreadme/make_readme.go
index 1c837771..295f0f91 100644
--- a/mkreadme/make_readme.go
+++ b/mkreadme/make_readme.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/datacharmer/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/common"
 )
 
 func getCmdOutput(cmdText string) string {
diff --git a/mkwiki/make_docs.go b/mkwiki/make_docs.go
index 155b8696..7c181e62 100644
--- a/mkwiki/make_docs.go
+++ b/mkwiki/make_docs.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/datacharmer/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/common"
 )
 
 func getCmdOutput(cmdText string) string {
@@ -96,7 +96,7 @@ func main() {
 	defer fullDoc.Close()
 	header1 := ""
 	header1Name := ""
-	wikiBaseUrl := "https://github.com/datacharmer/dbdeployer/wiki"
+	wikiBaseUrl := "https://github.com/ProxySQL/dbdeployer/wiki"
 
 	fmt.Fprintf(homeFile, "# dbdeployer\n")
 	fmt.Fprintf(fullDoc, "# dbdeployer\n")
@@ -173,7 +173,7 @@ func main() {
 			} else {
 				fmt.Fprintf(header1File, "%s\n", line)
 				if addHomeLink {
-					fmt.Fprintf(header1File, "[[HOME](https://github.com/datacharmer/dbdeployer/wiki)]\n")
+					fmt.Fprintf(header1File, "[[HOME](https://github.com/ProxySQL/dbdeployer/wiki)]\n")
 					addHomeLink = false
 				}
 			}
diff --git a/ops/defaults.go b/ops/defaults.go
index aadf8396..fbbb3ec6 100644
--- a/ops/defaults.go
+++ b/ops/defaults.go
@@ -20,9 +20,9 @@ import (
 	"os"
 	"path"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/rest"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/rest"
 )
 
 func ProcessBashCompletionEnabling(useRemote, runIt bool, remoteUrl, completionFile string) error {
diff --git a/ops/delete_binaries.go b/ops/delete_binaries.go
index de5f2767..6716fa43 100644
--- a/ops/delete_binaries.go
+++ b/ops/delete_binaries.go
@@ -22,9 +22,9 @@ import (
 	"path"
 	"strings"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 func sandboxesUsingBinariesDir(basedir, binariesDir string) ([]string, error) {
diff --git a/ops/downloads.go b/ops/downloads.go
index d206a9b9..9a6c135e 100644
--- a/ops/downloads.go
+++ b/ops/downloads.go
@@ -23,10 +23,10 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/downloads"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/rest"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/downloads"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/rest"
 	"github.com/dustin/go-humanize"
 )
 
diff --git a/ops/downloads_test.go b/ops/downloads_test.go
index af28bb52..0a85b126 100644
--- a/ops/downloads_test.go
+++ b/ops/downloads_test.go
@@ -21,9 +21,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/downloads"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/downloads"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/ops/init.go b/ops/init.go
index 5149f638..b2586cee 100644
--- a/ops/init.go
+++ b/ops/init.go
@@ -22,11 +22,11 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/downloads"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/rest"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/downloads"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/rest"
 )
 
 type InitOptions struct {
diff --git a/ops/sql.go b/ops/sql.go
index 87a13d53..f79d128b 100644
--- a/ops/sql.go
+++ b/ops/sql.go
@@ -21,9 +21,9 @@ import (
 	"os"
 	"path"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/importing"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/importing"
 )
 
 type sandboxConnection struct {
diff --git a/ops/unpack.go b/ops/unpack.go
index fd576ac5..f834cd36 100644
--- a/ops/unpack.go
+++ b/ops/unpack.go
@@ -22,9 +22,9 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/unpack"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/unpack"
 )
 
 type UnpackOptions struct {
diff --git a/ops/versions.go b/ops/versions.go
index 4a3b8d3e..18a39f31 100644
--- a/ops/versions.go
+++ b/ops/versions.go
@@ -18,7 +18,7 @@ package ops
 import (
 	"fmt"
 
-	"github.com/datacharmer/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/common"
 )
 
 type VersionOptions struct {
diff --git a/rest/rest.go b/rest/rest.go
index a8cece14..63ff1088 100644
--- a/rest/rest.go
+++ b/rest/rest.go
@@ -26,9 +26,9 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/pkg/errors"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 type ReleaseUser struct {
diff --git a/rest/rest_test.go b/rest/rest_test.go
index 49d01711..1c6bbe0b 100644
--- a/rest/rest_test.go
+++ b/rest/rest_test.go
@@ -18,7 +18,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/datacharmer/dbdeployer/compare"
+	"github.com/ProxySQL/dbdeployer/compare"
 )
 
 func TestDownloadFile(t *testing.T) {
diff --git a/sandbox/group_replication.go b/sandbox/group_replication.go
index 098d0619..3d9cf00a 100644
--- a/sandbox/group_replication.go
+++ b/sandbox/group_replication.go
@@ -22,10 +22,10 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/concurrent"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/concurrent"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"github.com/dustin/go-humanize/english"
 	"github.com/pkg/errors"
 )
@@ -238,6 +238,12 @@ func CreateGroupReplication(sandboxDef SandboxDef, origin string, nodes int, mas
 		"StopNodeList":      stopNodeList,
 		"Nodes":             []common.StringMap{},
 	}
+	replCmds := replicationCommands(sandboxDef.Version)
+	data["ChangeMasterTo"] = replCmds["ChangeMasterTo"]
+	data["MasterUserParam"] = replCmds["MasterUserParam"]
+	data["MasterPasswordParam"] = replCmds["MasterPasswordParam"]
+	data["StartReplica"] = replCmds["StartReplica"]
+	data["StopReplica"] = replCmds["StopReplica"]
 	connectionString := ""
 	for i := 0; i < nodes; i++ {
 		groupPort := baseGroupPort + i + 1
@@ -285,22 +291,25 @@ func CreateGroupReplication(sandboxDef SandboxDef, origin string, nodes int, mas
 		groupPort := baseGroupPort + i
 		sandboxDef.Port = basePort + i
 		data["Nodes"] = append(data["Nodes"].([]common.StringMap), common.StringMap{
-			"ShellPath":         sandboxDef.ShellPath,
-			"Copyright":         globals.ShellScriptCopyright,
-			"AppVersion":        common.VersionDef,
-			"DateTime":          timestamp.Format(time.UnixDate),
-			"Node":              i,
-			"NodePort":          sandboxDef.Port,
-			"MasterIp":          masterIp,
-			"NodeLabel":         nodeLabel,
-			"SlaveLabel":        slaveLabel,
-			"SlaveAbbr":         slaveAbbr,
-			"ChangeMasterExtra": changeMasterExtra,
-			"MasterLabel":       masterLabel,
-			"MasterAbbr":        masterAbbr,
-			"SandboxDir":        sandboxDef.SandboxDir,
-			"StopNodeList":      stopNodeList,
-			"RplUser":           sandboxDef.RplUser,
+			"ShellPath":            sandboxDef.ShellPath,
+			"Copyright":            globals.ShellScriptCopyright,
+			"AppVersion":           common.VersionDef,
+			"DateTime":             timestamp.Format(time.UnixDate),
+			"Node":                 i,
+			"NodePort":             sandboxDef.Port,
+			"MasterIp":             masterIp,
+			"NodeLabel":            nodeLabel,
+			"SlaveLabel":           slaveLabel,
+			"SlaveAbbr":            slaveAbbr,
+			"ChangeMasterExtra":    changeMasterExtra,
+			"ChangeMasterTo":       replCmds["ChangeMasterTo"],
+			"MasterUserParam":      replCmds["MasterUserParam"],
+			"MasterPasswordParam":  replCmds["MasterPasswordParam"],
+			"MasterLabel":          masterLabel,
+			"MasterAbbr":           masterAbbr,
+			"SandboxDir":           sandboxDef.SandboxDir,
+			"StopNodeList":         stopNodeList,
+			"RplUser":              sandboxDef.RplUser,
 			"RplPassword":       sandboxDef.RplPassword})
 
 		sandboxDef.DirName = fmt.Sprintf("%s%d", nodeLabel, i)
@@ -375,19 +384,22 @@ func CreateGroupReplication(sandboxDef SandboxDef, origin string, nodes int, mas
 		}
 		execLists = append(execLists, execList...)
 		var dataNode = common.StringMap{
-			"ShellPath":         sandboxDef.ShellPath,
-			"Copyright":         globals.ShellScriptCopyright,
-			"AppVersion":        common.VersionDef,
-			"DateTime":          timestamp.Format(time.UnixDate),
-			"Node":              i,
-			"NodePort":          sandboxDef.Port,
-			"NodeLabel":         nodeLabel,
-			"MasterLabel":       masterLabel,
-			"MasterAbbr":        masterAbbr,
-			"ChangeMasterExtra": changeMasterExtra,
-			"SlaveLabel":        slaveLabel,
-			"SlaveAbbr":         slaveAbbr,
-			"SandboxDir":        sandboxDef.SandboxDir,
+			"ShellPath":            sandboxDef.ShellPath,
+			"Copyright":            globals.ShellScriptCopyright,
+			"AppVersion":           common.VersionDef,
+			"DateTime":             timestamp.Format(time.UnixDate),
+			"Node":                 i,
+			"NodePort":             sandboxDef.Port,
+			"NodeLabel":            nodeLabel,
+			"MasterLabel":          masterLabel,
+			"MasterAbbr":           masterAbbr,
+			"ChangeMasterExtra":    changeMasterExtra,
+			"ChangeMasterTo":       replCmds["ChangeMasterTo"],
+			"MasterUserParam":      replCmds["MasterUserParam"],
+			"MasterPasswordParam":  replCmds["MasterPasswordParam"],
+			"SlaveLabel":           slaveLabel,
+			"SlaveAbbr":            slaveAbbr,
+			"SandboxDir":           sandboxDef.SandboxDir,
 		}
 		logger.Printf("Create node script for node %d\n", i)
 		err = writeScript(logger, MultipleTemplates, fmt.Sprintf("n%d", i), globals.TmplNode, sandboxDef.SandboxDir, dataNode, true)
diff --git a/sandbox/group_templates.go b/sandbox/group_templates.go
index 3d052f6b..3c1775b2 100644
--- a/sandbox/group_templates.go
+++ b/sandbox/group_templates.go
@@ -21,7 +21,7 @@ package sandbox
 import (
 	_ "embed"
 
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 // Templates for group replication
diff --git a/sandbox/import_templates.go b/sandbox/import_templates.go
index 1deddcf6..5fda8712 100644
--- a/sandbox/import_templates.go
+++ b/sandbox/import_templates.go
@@ -24,7 +24,7 @@ import (
 	"os"
 	"regexp"
 
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 var (
diff --git a/sandbox/mock.go b/sandbox/mock.go
index c785b232..f4acde26 100644
--- a/sandbox/mock.go
+++ b/sandbox/mock.go
@@ -21,9 +21,9 @@ import (
 	"path"
 	"runtime"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"github.com/pkg/errors"
 )
 
diff --git a/sandbox/multi-source-replication.go b/sandbox/multi-source-replication.go
index e1bfc9b2..807a7b9e 100644
--- a/sandbox/multi-source-replication.go
+++ b/sandbox/multi-source-replication.go
@@ -22,9 +22,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"github.com/dustin/go-humanize/english"
 )
 
diff --git a/sandbox/multi_templates.go b/sandbox/multi_templates.go
index 14897e52..b9290314 100644
--- a/sandbox/multi_templates.go
+++ b/sandbox/multi_templates.go
@@ -21,7 +21,7 @@ package sandbox
 import (
 	_ "embed"
 
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 // Templates for multiple sandboxes
diff --git a/sandbox/multiple.go b/sandbox/multiple.go
index cf46ad0b..4f3a017c 100644
--- a/sandbox/multiple.go
+++ b/sandbox/multiple.go
@@ -21,10 +21,10 @@ import (
 	"path"
 	"time"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/concurrent"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/concurrent"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"github.com/pkg/errors"
 )
 
diff --git a/sandbox/ndb_replication.go b/sandbox/ndb_replication.go
index 47cc119e..10dd66d9 100644
--- a/sandbox/ndb_replication.go
+++ b/sandbox/ndb_replication.go
@@ -22,10 +22,10 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/concurrent"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/concurrent"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"github.com/dustin/go-humanize/english"
 	"github.com/pkg/errors"
 )
diff --git a/sandbox/ndb_templates.go b/sandbox/ndb_templates.go
index 1bf36708..cbdeecfb 100644
--- a/sandbox/ndb_templates.go
+++ b/sandbox/ndb_templates.go
@@ -21,7 +21,7 @@ package sandbox
 import (
 	_ "embed"
 
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 //go:embed templates/ndb/ndb_start_cluster.gotxt
diff --git a/sandbox/pxc_replication.go b/sandbox/pxc_replication.go
index 7249c9a8..796ac274 100644
--- a/sandbox/pxc_replication.go
+++ b/sandbox/pxc_replication.go
@@ -22,10 +22,10 @@ import (
 	"github.com/dustin/go-humanize/english"
 	"github.com/pkg/errors"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/concurrent"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/concurrent"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 func CreatePxcReplication(sandboxDef SandboxDef, origin string, nodes int, masterIp string) error {
diff --git a/sandbox/pxc_templates.go b/sandbox/pxc_templates.go
index 28ac4e26..111b294d 100644
--- a/sandbox/pxc_templates.go
+++ b/sandbox/pxc_templates.go
@@ -21,7 +21,7 @@ package sandbox
 import (
 	_ "embed"
 
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 // Templates for group replication
diff --git a/sandbox/repl_templates.go b/sandbox/repl_templates.go
index 0ae8ad3e..93f71eb9 100644
--- a/sandbox/repl_templates.go
+++ b/sandbox/repl_templates.go
@@ -21,7 +21,7 @@ package sandbox
 import (
 	_ "embed"
 
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 // Templates for replication
diff --git a/sandbox/replication.go b/sandbox/replication.go
index ed62e9f7..540b16e1 100644
--- a/sandbox/replication.go
+++ b/sandbox/replication.go
@@ -21,10 +21,10 @@ import (
 	"path"
 	"time"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/concurrent"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/concurrent"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 	"github.com/dustin/go-humanize/english"
 	"github.com/pkg/errors"
 )
diff --git a/sandbox/sandbox.go b/sandbox/sandbox.go
index c3f00467..e951cbb0 100644
--- a/sandbox/sandbox.go
+++ b/sandbox/sandbox.go
@@ -27,10 +27,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/concurrent"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/concurrent"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 type SandboxDef struct {
diff --git a/sandbox/sandbox_test.go b/sandbox/sandbox_test.go
index 66562b92..a32a2493 100644
--- a/sandbox/sandbox_test.go
+++ b/sandbox/sandbox_test.go
@@ -22,10 +22,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/compare"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/compare"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 func okPortExists(t *testing.T, dirName string, port int) {
diff --git a/sandbox/templates.go b/sandbox/templates.go
index 8be5a1af..2795d9a4 100644
--- a/sandbox/templates.go
+++ b/sandbox/templates.go
@@ -23,9 +23,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 type TemplateDesc struct {
diff --git a/sandbox/templates/group/init_nodes.gotxt b/sandbox/templates/group/init_nodes.gotxt
index d6bec262..147cd97f 100644
--- a/sandbox/templates/group/init_nodes.gotxt
+++ b/sandbox/templates/group/init_nodes.gotxt
@@ -9,7 +9,7 @@ multi_sb={{.SandboxDir}}
 [ -z "$SLEEP_TIME" ] && SLEEP_TIME=1
 {{range .Nodes}}
     user_cmd='reset master;'
-    user_cmd="$user_cmd CHANGE MASTER TO MASTER_USER='rsandbox', MASTER_PASSWORD='rsandbox' {{.ChangeMasterExtra}} FOR CHANNEL 'group_replication_recovery';"
+    user_cmd="$user_cmd {{.ChangeMasterTo}} {{.MasterUserParam}}='rsandbox', {{.MasterPasswordParam}}='rsandbox' {{.ChangeMasterExtra}} FOR CHANNEL 'group_replication_recovery';"
 	echo "# Node {{.Node}} # $user_cmd"
     $multi_sb/{{.NodeLabel}}{{.Node}}/use -u root -e "$user_cmd"
 {{end}}
diff --git a/sandbox/templates/replication/semi_sync_start.gotxt b/sandbox/templates/replication/semi_sync_start.gotxt
index a649f50e..82255460 100644
--- a/sandbox/templates/replication/semi_sync_start.gotxt
+++ b/sandbox/templates/replication/semi_sync_start.gotxt
@@ -10,8 +10,8 @@ cd "$SBDIR"
 $SBDIR/{{.MasterLabel}}/use -u root -e 'set global rpl_semi_sync_master_enabled=1'
 echo "rpl_semi_sync_master_enabled=1" >> $SBDIR/{{.MasterLabel}}/my.sandbox.cnf
 {{ range .Slaves }}
-$SBDIR/{{.NodeLabel}}{{.Node}}/use -u root -e 'STOP SLAVE'
+$SBDIR/{{.NodeLabel}}{{.Node}}/use -u root -e '{{.StopReplica}}'
 $SBDIR/{{.NodeLabel}}{{.Node}}/use -u root -e 'set global rpl_semi_sync_slave_enabled=1'
-$SBDIR/{{.NodeLabel}}{{.Node}}/use -u root -e 'START SLAVE'
+$SBDIR/{{.NodeLabel}}{{.Node}}/use -u root -e '{{.StartReplica}}'
 echo "rpl_semi_sync_slave_enabled=1" >> $SBDIR/{{.NodeLabel}}{{.Node}}/my.sandbox.cnf
 {{end}}
diff --git a/sandbox/templates/single/clear.gotxt b/sandbox/templates/single/clear.gotxt
index 98cb1d43..12dacbd8 100644
--- a/sandbox/templates/single/clear.gotxt
+++ b/sandbox/templates/single/clear.gotxt
@@ -17,10 +17,15 @@ then
         echo "set sql_mode=ansi_quotes;drop database \"$D\"" | ./use
     done
     VERSION={{.Version}}
+    sortable_version=$(echo "$VERSION" | awk -F. '{printf "%03d%03d%03d", $1, $2, $3}')
     is_slave=$(ls data | grep relay)
     if [ -n "$is_slave" ]
     then
-        ./use -e "stop slave; reset slave;"
+        if [[ "v$sortable_version" > "v008000022" ]] || [[ "v$sortable_version" == "v008000022" ]]; then
+            ./use -e "stop replica; reset replica;"
+        else
+            ./use -e "stop slave; reset slave;"
+        fi
     fi
     if [[ "$VERSION" > "5.1" ]]
     then
diff --git a/sandbox/tidb_templates.go b/sandbox/tidb_templates.go
index 41b91478..898fd618 100644
--- a/sandbox/tidb_templates.go
+++ b/sandbox/tidb_templates.go
@@ -24,7 +24,7 @@ import (
 	"os"
 	"regexp"
 
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 var (
diff --git a/test/sort_versions.go b/test/sort_versions.go
index e65395ec..b986246d 100644
--- a/test/sort_versions.go
+++ b/test/sort_versions.go
@@ -18,7 +18,7 @@ package main
 import (
 	"bufio"
 	"fmt"
-	"github.com/datacharmer/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/common"
 	"os"
 )
 
diff --git a/ts/commands.go b/ts/commands.go
index ba2fdb25..9db9d9f8 100644
--- a/ts/commands.go
+++ b/ts/commands.go
@@ -26,9 +26,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
-	"github.com/datacharmer/dbdeployer/ops"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/ops"
 	"github.com/rogpeppe/go-internal/testscript"
 )
 
diff --git a/ts/conditions.go b/ts/conditions.go
index 0ffe6181..b7a2dc27 100644
--- a/ts/conditions.go
+++ b/ts/conditions.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/datacharmer/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/common"
 )
 
 func customConditions(condition string) (bool, error) {
diff --git a/ts/setup.go b/ts/setup.go
index 4963f9c8..64b425d9 100644
--- a/ts/setup.go
+++ b/ts/setup.go
@@ -28,10 +28,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/defaults"
-	"github.com/datacharmer/dbdeployer/downloads"
-	"github.com/datacharmer/dbdeployer/ops"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/defaults"
+	"github.com/ProxySQL/dbdeployer/downloads"
+	"github.com/ProxySQL/dbdeployer/ops"
 	"github.com/rogpeppe/go-internal/testscript"
 )
 
diff --git a/ts/test_helpers.go b/ts/test_helpers.go
index f3d702a2..37a37a93 100644
--- a/ts/test_helpers.go
+++ b/ts/test_helpers.go
@@ -18,7 +18,7 @@ package ts
 import (
 	"regexp"
 
-	"github.com/datacharmer/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/common"
 	"github.com/rogpeppe/go-internal/testscript"
 	"golang.org/x/exp/constraints"
 )
diff --git a/ts/ts_test.go b/ts/ts_test.go
index d0df428c..b7c2b13b 100644
--- a/ts/ts_test.go
+++ b/ts/ts_test.go
@@ -21,8 +21,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/datacharmer/dbdeployer/cmd"
-	"github.com/datacharmer/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/cmd"
+	"github.com/ProxySQL/dbdeployer/common"
 
 	"github.com/rogpeppe/go-internal/testscript"
 )
diff --git a/ts_static/ts_static_test.go b/ts_static/ts_static_test.go
index 26037cc3..e177f7e1 100644
--- a/ts_static/ts_static_test.go
+++ b/ts_static/ts_static_test.go
@@ -25,8 +25,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/datacharmer/dbdeployer/cmd"
-	"github.com/datacharmer/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/cmd"
+	"github.com/ProxySQL/dbdeployer/common"
 	"github.com/rogpeppe/go-internal/testscript"
 )
 
diff --git a/unpack/gunzip.go b/unpack/gunzip.go
index 96badcc1..e8338ddd 100644
--- a/unpack/gunzip.go
+++ b/unpack/gunzip.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 func gUnzipData(data []byte) (resData []byte, err error) {
diff --git a/unpack/unpack-shell.go b/unpack/unpack-shell.go
index efdc3904..055fc1fd 100644
--- a/unpack/unpack-shell.go
+++ b/unpack/unpack-shell.go
@@ -19,8 +19,8 @@ import (
 	"os"
 	"path"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 func MergeShell(tarball, extension, basedir, destination, bareName string, verbosity int) error {
diff --git a/unpack/unpack.go b/unpack/unpack.go
index bcf0e944..bfa77e85 100644
--- a/unpack/unpack.go
+++ b/unpack/unpack.go
@@ -65,8 +65,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/xi2/xz"
 
-	"github.com/datacharmer/dbdeployer/common"
-	"github.com/datacharmer/dbdeployer/globals"
+	"github.com/ProxySQL/dbdeployer/common"
+	"github.com/ProxySQL/dbdeployer/globals"
 )
 
 const (