diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eaf0a85..81b38b4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        go-version: [ 1.14.x, 1.15.x, 1.16.x ]
+        go-version: [ 1.16.x, 1.17.x ]
 
         # Set some variables per OS, usable via ${{ matrix.VAR }}
         # XK6_BIN_PATH: the path to the compiled k6 binary, for artifact publishing
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6178cc5..1ce81c7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        go-version: [ 1.14.x ]
+        go-version: [ 1.16.x ]
     runs-on: ${{ matrix.os }}
 
     steps:
diff --git a/README.md b/README.md
index 1ae0887..b210070 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 `xk6` - Custom k6 Builder
 ===============================
 
-This command line tool and associated Go package makes it easy to make custom builds of [k6](https://github.com/k6io/k6).
+This command line tool and associated Go package makes it easy to make custom builds of [k6](https://github.com/grafana/k6).
 
 It is used heavily by k6 extension developers as well as anyone who wishes to make custom `k6` binaries (with or without extensions).
 
@@ -15,10 +15,10 @@ Stay updated, be aware of changes, and please submit feedback! Thanks!
 
 ## Install
 
-You can [download binaries](https://github.com/k6io/xk6/releases) that are already compiled for your platform, or build `xk6` from source:
+You can [download binaries](https://github.com/grafana/xk6/releases) that are already compiled for your platform, or build `xk6` from source:
 
 ```bash
-$ go install github.com/k6io/xk6/cmd/xk6@latest
+$ go install go.k6.io/xk6/cmd/xk6@latest
 ```
 
 
diff --git a/cmd/xk6/main.go b/cmd/xk6/main.go
index 87d8bbe..d56733b 100644
--- a/cmd/xk6/main.go
+++ b/cmd/xk6/main.go
@@ -26,7 +26,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/k6io/xk6"
+	"go.k6.io/xk6"
 )
 
 var (
diff --git a/cmd/xk6/main_test.go b/cmd/xk6/main_test.go
index fdc96b8..e3d9e84 100644
--- a/cmd/xk6/main_test.go
+++ b/cmd/xk6/main_test.go
@@ -91,27 +91,27 @@ func TestNormalizeImportPath(t *testing.T) {
 
 	tests := testCaseType{
 		{"linux-path", args{
-			currentModule: "github.com/k6io/xk6",
+			currentModule: "go.k6.io/xk6",
 			cwd:           "/xk6",
 			moduleDir:     "/xk6",
-		}, "github.com/k6io/xk6"},
+		}, "go.k6.io/xk6"},
 		{"linux-subpath", args{
-			currentModule: "github.com/k6io/xk6",
+			currentModule: "go.k6.io/xk6",
 			cwd:           "/xk6/subdir",
 			moduleDir:     "/xk6",
-		}, "github.com/k6io/xk6/subdir"},
+		}, "go.k6.io/xk6/subdir"},
 	}
 	windowsTests := testCaseType{
 		{"windows-path", args{
-			currentModule: "github.com/k6io/xk6",
+			currentModule: "go.k6.io/xk6",
 			cwd:           "c:\\xk6",
 			moduleDir:     "c:\\xk6",
-		}, "github.com/k6io/xk6"},
+		}, "go.k6.io/xk6"},
 		{"windows-subpath", args{
-			currentModule: "github.com/k6io/xk6",
+			currentModule: "go.k6.io/xk6",
 			cwd:           "c:\\xk6\\subdir",
 			moduleDir:     "c:\\xk6",
-		}, "github.com/k6io/xk6/subdir"},
+		}, "go.k6.io/xk6/subdir"},
 	}
 	if runtime.GOOS == "windows" {
 		tests = append(tests, windowsTests...)
diff --git a/go.mod b/go.mod
index 8d8e515..78a9778 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,5 @@
-module github.com/k6io/xk6
+module go.k6.io/xk6
 
-go 1.15
+go 1.16
 
 require github.com/Masterminds/semver/v3 v3.1.0