diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8f555be469..882fa40bce 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,5 @@
 <!-- HTML Comments can be left in place or removed. -->
-<!-- Please see our contributing guide at https://github.com/rancher/k3s/blob/master/CONTRIBUTING.md for guidance on opening pull requests -->
+<!-- Please see our contributing guide at https://github.com/k3s-io/k3s/blob/master/CONTRIBUTING.md for guidance on opening pull requests -->
 
 #### Proposed Changes ####
 
@@ -15,7 +15,7 @@
 
 #### Linked Issues ####
 
-<!-- Link any related issues, pull-requests, or commit hashes that are relevant to this pull request. If you are opening a PR without a corresponding issue please consider creating one first, at https://github.com/rancher/k3s/issues . A functional example will greatly help QA with verifying/reproducing a bug or testing new features. -->
+<!-- Link any related issues, pull-requests, or commit hashes that are relevant to this pull request. If you are opening a PR without a corresponding issue please consider creating one first, at https://github.com/k3s-io/k3s/issues . A functional example will greatly help QA with verifying/reproducing a bug or testing new features. -->
 
 #### User-Facing Change ####
 <!--
diff --git a/BUILDING.md b/BUILDING.md
index 5db6e58501..1969b0fcd8 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -5,7 +5,7 @@
 Before getting started, bear in mind that this repository includes all of Kubernetes history, so consider shallow cloning with (`--depth 1`) to speed up the process.
 
 ```bash
-git clone --depth 1 https://github.com/rancher/k3s.git
+git clone --depth 1 https://github.com/k3s-io/k3s.git
 ```
 
 The k3s build process requires some autogenerated code and remote artifacts that are not checked in to version control. To prepare these resources for your build environment, run:
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 4b6503813e..ce80e16b10 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -39,10 +39,11 @@ RUN wget -O - ${YQ_URL}_$(go env GOARCH) > /usr/bin/yq && chmod +x /usr/bin/yq
 ARG SELINUX=true
 ENV SELINUX $SELINUX
 
-ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/rancher/k3s/.cache -v trivy-cache:/root/.cache/trivy
+ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/k3s-io/k3s/.cache -v trivy-cache:/root/.cache/trivy
 ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_AIRGAP GCLOUD_AUTH GITHUB_TOKEN GOLANG
-ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
+ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/
 ENV DAPPER_OUTPUT ./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy
+
 ENV DAPPER_DOCKER_SOCKET true
 ENV HOME ${DAPPER_SOURCE}
 ENV CROSS true
diff --git a/Dockerfile.test.dapper b/Dockerfile.test.dapper
index f6e6affdb9..d3cc2eaca9 100644
--- a/Dockerfile.test.dapper
+++ b/Dockerfile.test.dapper
@@ -20,7 +20,7 @@ ENV TEST_CLEANUP true
 
 ENV DAPPER_RUN_ARGS --privileged --network host -v /tmp:/tmp
 ENV DAPPER_ENV REPO TAG DRONE_TAG DRONE_BUILD_EVENT IMAGE_NAME GCLOUD_AUTH SONOBUOY_VERSION ENABLE_REGISTRY
-ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
+ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/
 ENV DAPPER_OUTPUT ./dist
 ENV DAPPER_DOCKER_SOCKET true
 ENV HOME ${DAPPER_SOURCE}
diff --git a/Dockerfile.test.mod.dapper b/Dockerfile.test.mod.dapper
index 57b665c356..babad48d05 100644
--- a/Dockerfile.test.mod.dapper
+++ b/Dockerfile.test.mod.dapper
@@ -2,7 +2,7 @@ ARG GOLANG=golang:1.17.5-alpine3.15
 FROM ${GOLANG}
 
 RUN apk -U --no-cache add bash jq
-ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
+ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/
 ENV HOME ${DAPPER_SOURCE}
 WORKDIR ${DAPPER_SOURCE}
 
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
index 268995d32c..1ed96710bb 100644
--- a/cmd/agent/main.go
+++ b/cmd/agent/main.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/agent"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/cli/agent"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/cert/main.go b/cmd/cert/main.go
index fe40998de6..c64070c7bc 100644
--- a/cmd/cert/main.go
+++ b/cmd/cert/main.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/cert"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/cli/cert"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/containerd/main.go b/cmd/containerd/main.go
index 42e08b1e7e..90f2043632 100644
--- a/cmd/containerd/main.go
+++ b/cmd/containerd/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/rancher/k3s/pkg/containerd"
+	"github.com/k3s-io/k3s/pkg/containerd"
 	"k8s.io/klog"
 )
 
diff --git a/cmd/ctr/main.go b/cmd/ctr/main.go
index 378258c46e..09500360e9 100644
--- a/cmd/ctr/main.go
+++ b/cmd/ctr/main.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/rancher/k3s/pkg/ctr"
+import "github.com/k3s-io/k3s/pkg/ctr"
 
 func main() {
 	ctr.Main()
diff --git a/cmd/encrypt/main.go b/cmd/encrypt/main.go
index e1b43b83b2..edceb18f34 100644
--- a/cmd/encrypt/main.go
+++ b/cmd/encrypt/main.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/cli/secretsencrypt"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/secretsencrypt"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/etcdsnapshot/main.go b/cmd/etcdsnapshot/main.go
index 071a82730b..bbe66df1c1 100644
--- a/cmd/etcdsnapshot/main.go
+++ b/cmd/etcdsnapshot/main.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/cli/etcdsnapshot"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/etcdsnapshot"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/k3s/main.go b/cmd/k3s/main.go
index 7d505d0060..73aee27d96 100644
--- a/cmd/k3s/main.go
+++ b/cmd/k3s/main.go
@@ -9,15 +9,15 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/data"
+	"github.com/k3s-io/k3s/pkg/datadir"
+	"github.com/k3s-io/k3s/pkg/dataverify"
+	"github.com/k3s-io/k3s/pkg/flock"
+	"github.com/k3s-io/k3s/pkg/untar"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/configfilearg"
-	"github.com/rancher/k3s/pkg/data"
-	"github.com/rancher/k3s/pkg/datadir"
-	"github.com/rancher/k3s/pkg/dataverify"
-	"github.com/rancher/k3s/pkg/flock"
-	"github.com/rancher/k3s/pkg/untar"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/resolvehome"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
diff --git a/cmd/kubectl/main.go b/cmd/kubectl/main.go
index b85cd68b74..c27175d22a 100644
--- a/cmd/kubectl/main.go
+++ b/cmd/kubectl/main.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/rancher/k3s/pkg/kubectl"
+import "github.com/k3s-io/k3s/pkg/kubectl"
 
 func main() {
 	kubectl.Main()
diff --git a/cmd/server/main.go b/cmd/server/main.go
index 12624b0c78..e96d214039 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -7,20 +7,20 @@ import (
 	"path/filepath"
 
 	"github.com/docker/docker/pkg/reexec"
+	"github.com/k3s-io/k3s/pkg/cli/agent"
+	"github.com/k3s-io/k3s/pkg/cli/cert"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/crictl"
+	"github.com/k3s-io/k3s/pkg/cli/ctr"
+	"github.com/k3s-io/k3s/pkg/cli/etcdsnapshot"
+	"github.com/k3s-io/k3s/pkg/cli/kubectl"
+	"github.com/k3s-io/k3s/pkg/cli/secretsencrypt"
+	"github.com/k3s-io/k3s/pkg/cli/server"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/containerd"
+	ctr2 "github.com/k3s-io/k3s/pkg/ctr"
+	kubectl2 "github.com/k3s-io/k3s/pkg/kubectl"
 	crictl2 "github.com/kubernetes-sigs/cri-tools/cmd/crictl"
-	"github.com/rancher/k3s/pkg/cli/agent"
-	"github.com/rancher/k3s/pkg/cli/cert"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/cli/crictl"
-	"github.com/rancher/k3s/pkg/cli/ctr"
-	"github.com/rancher/k3s/pkg/cli/etcdsnapshot"
-	"github.com/rancher/k3s/pkg/cli/kubectl"
-	"github.com/rancher/k3s/pkg/cli/secretsencrypt"
-	"github.com/rancher/k3s/pkg/cli/server"
-	"github.com/rancher/k3s/pkg/configfilearg"
-	"github.com/rancher/k3s/pkg/containerd"
-	ctr2 "github.com/rancher/k3s/pkg/ctr"
-	kubectl2 "github.com/rancher/k3s/pkg/kubectl"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/contrib/ansible/README.md b/contrib/ansible/README.md
index 4d6329e321..ee4e9159dd 100644
--- a/contrib/ansible/README.md
+++ b/contrib/ansible/README.md
@@ -1,3 +1,3 @@
 # Build a Kubernetes cluster using k3s via Ansible
 
-The ansible playbook was moved to https://github.com/rancher/k3s-ansible
+The ansible playbook was moved to https://github.com/k3s-io/k3s-ansible
diff --git a/go.mod b/go.mod
index 0df3e67b42..2a3c332d6c 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/rancher/k3s
+module github.com/k3s-io/k3s
 
 go 1.16
 
@@ -15,7 +15,6 @@ replace (
 	github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.0.5
 	github.com/juju/errors => github.com/k3s-io/nocode v0.0.0-20200630202308-cb097102c09f
 	github.com/kubernetes-sigs/cri-tools => github.com/k3s-io/cri-tools v1.22.0-k3s1
-	github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009
 	github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.3
 	github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
 	github.com/rancher/wrangler => github.com/rancher/wrangler v0.8.11-0.20220211163748-d5a8ee98be5f
diff --git a/main.go b/main.go
index 3da505e6dc..dfd910fabc 100644
--- a/main.go
+++ b/main.go
@@ -11,15 +11,15 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/agent"
-	"github.com/rancher/k3s/pkg/cli/cert"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/cli/crictl"
-	"github.com/rancher/k3s/pkg/cli/etcdsnapshot"
-	"github.com/rancher/k3s/pkg/cli/kubectl"
-	"github.com/rancher/k3s/pkg/cli/secretsencrypt"
-	"github.com/rancher/k3s/pkg/cli/server"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/cli/agent"
+	"github.com/k3s-io/k3s/pkg/cli/cert"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/crictl"
+	"github.com/k3s-io/k3s/pkg/cli/etcdsnapshot"
+	"github.com/k3s-io/k3s/pkg/cli/kubectl"
+	"github.com/k3s-io/k3s/pkg/cli/secretsencrypt"
+	"github.com/k3s-io/k3s/pkg/cli/server"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/package/rpm/install.sh b/package/rpm/install.sh
index d8653e8019..75809c1772 100755
--- a/package/rpm/install.sh
+++ b/package/rpm/install.sh
@@ -93,7 +93,7 @@ if [ "$INSTALL_K3S_DEBUG" = "true" ]; then
     set -x
 fi
 
-GITHUB_URL=https://github.com/rancher/k3s/releases
+GITHUB_URL=https://github.com/k3s-io/k3s/releases
 STORAGE_URL=https://storage.googleapis.com/k3s-ci-builds
 DOWNLOADER=
 
diff --git a/pkg/agent/config/config.go b/pkg/agent/config/config.go
index 69ec633ada..f6c1e3fc5c 100644
--- a/pkg/agent/config/config.go
+++ b/pkg/agent/config/config.go
@@ -19,15 +19,15 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/agent/proxy"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/containerd"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/control/deps"
+	"github.com/k3s-io/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/proxy"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/containerd"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/control/deps"
-	"github.com/rancher/k3s/pkg/util"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/slice"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/util/json"
diff --git a/pkg/agent/config/config_linux.go b/pkg/agent/config/config_linux.go
index c2d865fdf4..b69b42fbab 100644
--- a/pkg/agent/config/config_linux.go
+++ b/pkg/agent/config/config_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package config
@@ -5,7 +6,7 @@ package config
 import (
 	"path/filepath"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func applyContainerdStateAndAddress(nodeConfig *config.Node) {
diff --git a/pkg/agent/config/config_windows.go b/pkg/agent/config/config_windows.go
index a9534ccfc5..a387336eb2 100644
--- a/pkg/agent/config/config_windows.go
+++ b/pkg/agent/config/config_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package config
@@ -5,7 +6,7 @@ package config
 import (
 	"path/filepath"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func applyContainerdStateAndAddress(nodeConfig *config.Node) {
diff --git a/pkg/agent/containerd/config_linux.go b/pkg/agent/containerd/config_linux.go
index 8f886403ea..d876b33f43 100644
--- a/pkg/agent/containerd/config_linux.go
+++ b/pkg/agent/containerd/config_linux.go
@@ -9,13 +9,13 @@ import (
 	"os"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/agent/templates"
+	util2 "github.com/k3s-io/k3s/pkg/agent/util"
+	"github.com/k3s-io/k3s/pkg/cgroups"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/opencontainers/runc/libcontainer/userns"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/templates"
-	util2 "github.com/rancher/k3s/pkg/agent/util"
-	"github.com/rancher/k3s/pkg/cgroups"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wharfie/pkg/registries"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
diff --git a/pkg/agent/containerd/config_windows.go b/pkg/agent/containerd/config_windows.go
index 3efb80197f..348ecd5a2f 100644
--- a/pkg/agent/containerd/config_windows.go
+++ b/pkg/agent/containerd/config_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package containerd
@@ -8,9 +9,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/rancher/k3s/pkg/agent/templates"
-	util2 "github.com/rancher/k3s/pkg/agent/util"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/agent/templates"
+	util2 "github.com/k3s-io/k3s/pkg/agent/util"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/rancher/wharfie/pkg/registries"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
diff --git a/pkg/agent/containerd/containerd.go b/pkg/agent/containerd/containerd.go
index 82befb6a2a..b54e28a1c3 100644
--- a/pkg/agent/containerd/containerd.go
+++ b/pkg/agent/containerd/containerd.go
@@ -19,11 +19,11 @@ import (
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/pkg/cri/constants"
 	"github.com/containerd/containerd/reference/docker"
+	util2 "github.com/k3s-io/k3s/pkg/agent/util"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/natefinch/lumberjack"
 	"github.com/pkg/errors"
-	util2 "github.com/rancher/k3s/pkg/agent/util"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wharfie/pkg/tarfile"
 	"github.com/rancher/wrangler/pkg/merr"
 	"github.com/sirupsen/logrus"
diff --git a/pkg/agent/containerd/nvidia.go b/pkg/agent/containerd/nvidia.go
index 28b4a96857..96aae90a09 100644
--- a/pkg/agent/containerd/nvidia.go
+++ b/pkg/agent/containerd/nvidia.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package containerd
@@ -7,7 +8,7 @@ import (
 	"io/fs"
 	"path/filepath"
 
-	"github.com/rancher/k3s/pkg/agent/templates"
+	"github.com/k3s-io/k3s/pkg/agent/templates"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/agent/containerd/nvidia_test.go b/pkg/agent/containerd/nvidia_test.go
index 8a9497e767..2f6f2fc0b0 100644
--- a/pkg/agent/containerd/nvidia_test.go
+++ b/pkg/agent/containerd/nvidia_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package containerd
@@ -8,7 +9,7 @@ import (
 	"testing"
 	"testing/fstest"
 
-	"github.com/rancher/k3s/pkg/agent/templates"
+	"github.com/k3s-io/k3s/pkg/agent/templates"
 )
 
 func Test_UnitFindNvidiaContainerRuntimes(t *testing.T) {
diff --git a/pkg/agent/flannel/setup.go b/pkg/agent/flannel/setup.go
index 02228406b9..18065c185e 100644
--- a/pkg/agent/flannel/setup.go
+++ b/pkg/agent/flannel/setup.go
@@ -8,10 +8,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/k3s-io/k3s/pkg/agent/util"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/util"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/agent/flannel/setup_test.go b/pkg/agent/flannel/setup_test.go
index 0da6cf1668..800ecd3512 100644
--- a/pkg/agent/flannel/setup_test.go
+++ b/pkg/agent/flannel/setup_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func stringToCIDR(s string) []*net.IPNet {
diff --git a/pkg/agent/loadbalancer/config.go b/pkg/agent/loadbalancer/config.go
index defeb70bd9..2fecce7665 100644
--- a/pkg/agent/loadbalancer/config.go
+++ b/pkg/agent/loadbalancer/config.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 
-	"github.com/rancher/k3s/pkg/agent/util"
+	"github.com/k3s-io/k3s/pkg/agent/util"
 )
 
 func (lb *LoadBalancer) writeConfig() error {
diff --git a/pkg/agent/loadbalancer/loadbalancer.go b/pkg/agent/loadbalancer/loadbalancer.go
index f3d10815a7..4bf0a2eee4 100644
--- a/pkg/agent/loadbalancer/loadbalancer.go
+++ b/pkg/agent/loadbalancer/loadbalancer.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	"inet.af/tcpproxy"
 )
diff --git a/pkg/agent/loadbalancer/loadbalancer_test.go b/pkg/agent/loadbalancer/loadbalancer_test.go
index 9ac93cffb3..3a577e7693 100644
--- a/pkg/agent/loadbalancer/loadbalancer_test.go
+++ b/pkg/agent/loadbalancer/loadbalancer_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
 )
 
 type server struct {
diff --git a/pkg/agent/netpol/netpol.go b/pkg/agent/netpol/netpol.go
index 6df0e727ce..8e6e34aeb5 100644
--- a/pkg/agent/netpol/netpol.go
+++ b/pkg/agent/netpol/netpol.go
@@ -15,7 +15,7 @@ import (
 	"github.com/cloudnativelabs/kube-router/pkg/healthcheck"
 	"github.com/cloudnativelabs/kube-router/pkg/options"
 	"github.com/cloudnativelabs/kube-router/pkg/utils"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/sirupsen/logrus"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
diff --git a/pkg/agent/netpol/netpol_windows.go b/pkg/agent/netpol/netpol_windows.go
index ac7933ba71..72aa41be62 100644
--- a/pkg/agent/netpol/netpol_windows.go
+++ b/pkg/agent/netpol/netpol_windows.go
@@ -3,7 +3,7 @@ package netpol
 import (
 	"context"
 
-	daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
+	daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func Run(ctx context.Context, nodeConfig *daemonconfig.Node) error {
diff --git a/pkg/agent/proxy/apiproxy.go b/pkg/agent/proxy/apiproxy.go
index 99babef776..9f7e0773c3 100644
--- a/pkg/agent/proxy/apiproxy.go
+++ b/pkg/agent/proxy/apiproxy.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/sirupsen/logrus"
 
+	"github.com/k3s-io/k3s/pkg/agent/loadbalancer"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/loadbalancer"
 )
 
 type Proxy interface {
diff --git a/pkg/agent/run.go b/pkg/agent/run.go
index 8086aa3670..b3cfc8248b 100644
--- a/pkg/agent/run.go
+++ b/pkg/agent/run.go
@@ -11,24 +11,24 @@ import (
 	"time"
 
 	systemd "github.com/coreos/go-systemd/daemon"
+	"github.com/k3s-io/k3s/pkg/agent/config"
+	"github.com/k3s-io/k3s/pkg/agent/containerd"
+	"github.com/k3s-io/k3s/pkg/agent/flannel"
+	"github.com/k3s-io/k3s/pkg/agent/netpol"
+	"github.com/k3s-io/k3s/pkg/agent/proxy"
+	"github.com/k3s-io/k3s/pkg/agent/syssetup"
+	"github.com/k3s-io/k3s/pkg/agent/tunnel"
+	"github.com/k3s-io/k3s/pkg/cgroups"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	cp "github.com/k3s-io/k3s/pkg/cloudprovider"
+	"github.com/k3s-io/k3s/pkg/daemons/agent"
+	daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/executor"
+	"github.com/k3s-io/k3s/pkg/nodeconfig"
+	"github.com/k3s-io/k3s/pkg/rootless"
+	"github.com/k3s-io/k3s/pkg/util"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/config"
-	"github.com/rancher/k3s/pkg/agent/containerd"
-	"github.com/rancher/k3s/pkg/agent/flannel"
-	"github.com/rancher/k3s/pkg/agent/netpol"
-	"github.com/rancher/k3s/pkg/agent/proxy"
-	"github.com/rancher/k3s/pkg/agent/syssetup"
-	"github.com/rancher/k3s/pkg/agent/tunnel"
-	"github.com/rancher/k3s/pkg/cgroups"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	cp "github.com/rancher/k3s/pkg/cloudprovider"
-	"github.com/rancher/k3s/pkg/daemons/agent"
-	daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/executor"
-	"github.com/rancher/k3s/pkg/nodeconfig"
-	"github.com/rancher/k3s/pkg/rootless"
-	"github.com/rancher/k3s/pkg/util"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
diff --git a/pkg/agent/run_linux.go b/pkg/agent/run_linux.go
index 3abd62070a..cb275ed585 100644
--- a/pkg/agent/run_linux.go
+++ b/pkg/agent/run_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package agent
@@ -7,8 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 const (
diff --git a/pkg/agent/run_windows.go b/pkg/agent/run_windows.go
index 1340087cb5..3b60120db6 100644
--- a/pkg/agent/run_windows.go
+++ b/pkg/agent/run_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package agent
@@ -8,8 +9,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 const (
diff --git a/pkg/agent/templates/templates.go b/pkg/agent/templates/templates.go
index 21bdc2f9e1..5d27b09c46 100644
--- a/pkg/agent/templates/templates.go
+++ b/pkg/agent/templates/templates.go
@@ -3,7 +3,7 @@ package templates
 import (
 	"github.com/rancher/wharfie/pkg/registries"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 type ContainerdRuntimeConfig struct {
diff --git a/pkg/agent/tunnel/tunnel.go b/pkg/agent/tunnel/tunnel.go
index 65f963e3b7..5bac7381e2 100644
--- a/pkg/agent/tunnel/tunnel.go
+++ b/pkg/agent/tunnel/tunnel.go
@@ -10,10 +10,10 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	"github.com/rancher/k3s/pkg/agent/proxy"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/util"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/agent/proxy"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/rancher/remotedialer"
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
diff --git a/pkg/apiaddresses/controller.go b/pkg/apiaddresses/controller.go
index ed4d3705dd..d1609d7718 100644
--- a/pkg/apiaddresses/controller.go
+++ b/pkg/apiaddresses/controller.go
@@ -5,10 +5,10 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/etcd"
-	"github.com/rancher/k3s/pkg/util"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/version"
 	controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	v1 "k8s.io/api/core/v1"
diff --git a/pkg/apis/k3s.cattle.io/v1/zz_generated_register.go b/pkg/apis/k3s.cattle.io/v1/zz_generated_register.go
index 561772b763..80e8f36298 100644
--- a/pkg/apis/k3s.cattle.io/v1/zz_generated_register.go
+++ b/pkg/apis/k3s.cattle.io/v1/zz_generated_register.go
@@ -21,7 +21,7 @@ limitations under the License.
 package v1
 
 import (
-	k3s "github.com/rancher/k3s/pkg/apis/k3s.cattle.io"
+	k3s "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/authenticator/basicauth/basicauth.go b/pkg/authenticator/basicauth/basicauth.go
index 80812d3201..0eff4474e4 100644
--- a/pkg/authenticator/basicauth/basicauth.go
+++ b/pkg/authenticator/basicauth/basicauth.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"net/http"
 
-	localAuthenticator "github.com/rancher/k3s/pkg/authenticator"
+	localAuthenticator "github.com/k3s-io/k3s/pkg/authenticator"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 )
 
diff --git a/pkg/bootstrap/bootstrap.go b/pkg/bootstrap/bootstrap.go
index 884fb60dde..926f42e9c5 100644
--- a/pkg/bootstrap/bootstrap.go
+++ b/pkg/bootstrap/bootstrap.go
@@ -9,8 +9,8 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/daemons/config"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/bootstrap/bootstrap_test.go b/pkg/bootstrap/bootstrap_test.go
index d6fe3fb74f..96c66aee01 100644
--- a/pkg/bootstrap/bootstrap_test.go
+++ b/pkg/bootstrap/bootstrap_test.go
@@ -3,7 +3,7 @@ package bootstrap
 import (
 	"testing"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func TestObjToMap(t *testing.T) {
diff --git a/pkg/cgroups/cgroups_linux.go b/pkg/cgroups/cgroups_linux.go
index 3f97ba915c..3b9b4b333e 100644
--- a/pkg/cgroups/cgroups_linux.go
+++ b/pkg/cgroups/cgroups_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package cgroups
@@ -13,7 +14,7 @@ import (
 
 	"github.com/containerd/cgroups"
 	cgroupsv2 "github.com/containerd/cgroups/v2"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/cli/agent/agent.go b/pkg/cli/agent/agent.go
index 0872f251d4..baa58d8a75 100644
--- a/pkg/cli/agent/agent.go
+++ b/pkg/cli/agent/agent.go
@@ -6,12 +6,12 @@ import (
 	"runtime"
 
 	"github.com/erikdubbelboer/gspt"
-	"github.com/rancher/k3s/pkg/agent"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/datadir"
-	"github.com/rancher/k3s/pkg/netutil"
-	"github.com/rancher/k3s/pkg/token"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/agent"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/datadir"
+	"github.com/k3s-io/k3s/pkg/netutil"
+	"github.com/k3s-io/k3s/pkg/token"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/signals"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
diff --git a/pkg/cli/cert/cert.go b/pkg/cli/cert/cert.go
index ca4fe746a2..97806c8032 100644
--- a/pkg/cli/cert/cert.go
+++ b/pkg/cli/cert/cert.go
@@ -9,13 +9,13 @@ import (
 	"time"
 
 	"github.com/erikdubbelboer/gspt"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/control/deps"
+	"github.com/k3s-io/k3s/pkg/datadir"
+	"github.com/k3s-io/k3s/pkg/server"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/otiai10/copy"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/control/deps"
-	"github.com/rancher/k3s/pkg/datadir"
-	"github.com/rancher/k3s/pkg/server"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/pkg/cli/cmds/agent.go b/pkg/cli/cmds/agent.go
index 859c20ed71..90e1dac9ce 100644
--- a/pkg/cli/cmds/agent.go
+++ b/pkg/cli/cmds/agent.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 
diff --git a/pkg/cli/cmds/certs.go b/pkg/cli/cmds/certs.go
index 36d11d35fe..e4384f8f4c 100644
--- a/pkg/cli/cmds/certs.go
+++ b/pkg/cli/cmds/certs.go
@@ -1,7 +1,7 @@
 package cmds
 
 import (
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 
diff --git a/pkg/cli/cmds/config.go b/pkg/cli/cmds/config.go
index f539e767d9..7977327910 100644
--- a/pkg/cli/cmds/config.go
+++ b/pkg/cli/cmds/config.go
@@ -1,7 +1,7 @@
 package cmds
 
 import (
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 
diff --git a/pkg/cli/cmds/etcd_snapshot.go b/pkg/cli/cmds/etcd_snapshot.go
index 046d82832f..23ace5c546 100644
--- a/pkg/cli/cmds/etcd_snapshot.go
+++ b/pkg/cli/cmds/etcd_snapshot.go
@@ -3,7 +3,7 @@ package cmds
 import (
 	"time"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 
diff --git a/pkg/cli/cmds/log_linux.go b/pkg/cli/cmds/log_linux.go
index ea7f374c64..18e9c32ba1 100644
--- a/pkg/cli/cmds/log_linux.go
+++ b/pkg/cli/cmds/log_linux.go
@@ -1,3 +1,4 @@
+//go:build linux && cgo
 // +build linux,cgo
 
 package cmds
@@ -11,9 +12,9 @@ import (
 
 	systemd "github.com/coreos/go-systemd/daemon"
 	"github.com/erikdubbelboer/gspt"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/natefinch/lumberjack"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/version"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/pkg/cli/cmds/root.go b/pkg/cli/cmds/root.go
index 1bb97635ad..0e2dbf791a 100644
--- a/pkg/cli/cmds/root.go
+++ b/pkg/cli/cmds/root.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 
diff --git a/pkg/cli/cmds/secrets_encrypt.go b/pkg/cli/cmds/secrets_encrypt.go
index fc308cd8e4..9bde833f6f 100644
--- a/pkg/cli/cmds/secrets_encrypt.go
+++ b/pkg/cli/cmds/secrets_encrypt.go
@@ -1,7 +1,7 @@
 package cmds
 
 import (
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 
diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go
index d6152fc690..18cf28495b 100644
--- a/pkg/cli/cmds/server.go
+++ b/pkg/cli/cmds/server.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 
diff --git a/pkg/cli/ctr/ctr.go b/pkg/cli/ctr/ctr.go
index a8aab2d60c..63ae8bad2c 100644
--- a/pkg/cli/ctr/ctr.go
+++ b/pkg/cli/ctr/ctr.go
@@ -1,7 +1,7 @@
 package ctr
 
 import (
-	"github.com/rancher/k3s/pkg/ctr"
+	"github.com/k3s-io/k3s/pkg/ctr"
 	"github.com/urfave/cli"
 )
 
diff --git a/pkg/cli/etcdsnapshot/etcd_snapshot.go b/pkg/cli/etcdsnapshot/etcd_snapshot.go
index 32b203a6c2..5be91c7187 100644
--- a/pkg/cli/etcdsnapshot/etcd_snapshot.go
+++ b/pkg/cli/etcdsnapshot/etcd_snapshot.go
@@ -11,12 +11,12 @@ import (
 	"time"
 
 	"github.com/erikdubbelboer/gspt"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/cluster"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/etcd"
-	"github.com/rancher/k3s/pkg/server"
-	util2 "github.com/rancher/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cluster"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/server"
+	util2 "github.com/k3s-io/k3s/pkg/util"
 	"github.com/rancher/wrangler/pkg/signals"
 	"github.com/urfave/cli"
 	"gopkg.in/yaml.v2"
diff --git a/pkg/cli/kubectl/kubectl.go b/pkg/cli/kubectl/kubectl.go
index 4c047a4c53..c21ae76992 100644
--- a/pkg/cli/kubectl/kubectl.go
+++ b/pkg/cli/kubectl/kubectl.go
@@ -1,7 +1,7 @@
 package kubectl
 
 import (
-	"github.com/rancher/k3s/pkg/kubectl"
+	"github.com/k3s-io/k3s/pkg/kubectl"
 	"github.com/urfave/cli"
 )
 
diff --git a/pkg/cli/secretsencrypt/secrets_encrypt.go b/pkg/cli/secretsencrypt/secrets_encrypt.go
index 8b4ace5791..5c16b92cbf 100644
--- a/pkg/cli/secretsencrypt/secrets_encrypt.go
+++ b/pkg/cli/secretsencrypt/secrets_encrypt.go
@@ -11,11 +11,11 @@ import (
 	"text/tabwriter"
 
 	"github.com/erikdubbelboer/gspt"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/secretsencrypt"
-	"github.com/rancher/k3s/pkg/server"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/secretsencrypt"
+	"github.com/k3s-io/k3s/pkg/server"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 	"k8s.io/utils/pointer"
 )
diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go
index f46afcca44..b4a9713465 100644
--- a/pkg/cli/server/server.go
+++ b/pkg/cli/server/server.go
@@ -11,20 +11,20 @@ import (
 
 	systemd "github.com/coreos/go-systemd/daemon"
 	"github.com/erikdubbelboer/gspt"
+	"github.com/k3s-io/k3s/pkg/agent"
+	"github.com/k3s-io/k3s/pkg/agent/loadbalancer"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/datadir"
+	"github.com/k3s-io/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/netutil"
+	"github.com/k3s-io/k3s/pkg/rootless"
+	"github.com/k3s-io/k3s/pkg/server"
+	"github.com/k3s-io/k3s/pkg/token"
+	"github.com/k3s-io/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent"
-	"github.com/rancher/k3s/pkg/agent/loadbalancer"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/datadir"
-	"github.com/rancher/k3s/pkg/etcd"
-	"github.com/rancher/k3s/pkg/netutil"
-	"github.com/rancher/k3s/pkg/rootless"
-	"github.com/rancher/k3s/pkg/server"
-	"github.com/rancher/k3s/pkg/token"
-	"github.com/rancher/k3s/pkg/util"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/signals"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
diff --git a/pkg/clientaccess/token_test.go b/pkg/clientaccess/token_test.go
index 488f821e72..b16e4f1ff9 100644
--- a/pkg/clientaccess/token_test.go
+++ b/pkg/clientaccess/token_test.go
@@ -11,10 +11,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/bootstrap"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/rancher/dynamiclistener/cert"
 	"github.com/rancher/dynamiclistener/factory"
-	"github.com/rancher/k3s/pkg/bootstrap"
-	"github.com/rancher/k3s/pkg/daemons/config"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go
index 8e641c5a5f..b1009331d8 100644
--- a/pkg/cloudprovider/cloudprovider.go
+++ b/pkg/cloudprovider/cloudprovider.go
@@ -3,7 +3,7 @@ package cloudprovider
 import (
 	"io"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"k8s.io/client-go/informers"
 	informercorev1 "k8s.io/client-go/informers/core/v1"
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/cloudprovider/instances.go b/pkg/cloudprovider/instances.go
index dd209a1046..74bdc53aa7 100644
--- a/pkg/cloudprovider/instances.go
+++ b/pkg/cloudprovider/instances.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/pkg/cluster/bootstrap.go b/pkg/cluster/bootstrap.go
index 71727cd4ff..58fcdec5c9 100644
--- a/pkg/cluster/bootstrap.go
+++ b/pkg/cluster/bootstrap.go
@@ -15,15 +15,15 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/bootstrap"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/k3s-io/kine/pkg/client"
 	"github.com/k3s-io/kine/pkg/endpoint"
 	"github.com/otiai10/copy"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/bootstrap"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/etcd"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/cluster/bootstrap_test.go b/pkg/cluster/bootstrap_test.go
index f19b9bd3a0..b20a36fd68 100644
--- a/pkg/cluster/bootstrap_test.go
+++ b/pkg/cluster/bootstrap_test.go
@@ -8,10 +8,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rancher/k3s/pkg/bootstrap"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/cluster/managed"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/bootstrap"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/cluster/managed"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func Test_isDirEmpty(t *testing.T) {
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index 12c6323d00..c36039f8f5 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -6,12 +6,12 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/cluster/managed"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/etcd"
 	"github.com/k3s-io/kine/pkg/endpoint"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/cluster/managed"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/etcd"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/cluster/encrypt.go b/pkg/cluster/encrypt.go
index 5ce6a78cfb..d82a75e46d 100644
--- a/pkg/cluster/encrypt.go
+++ b/pkg/cluster/encrypt.go
@@ -12,7 +12,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/rancher/k3s/pkg/token"
+	"github.com/k3s-io/k3s/pkg/token"
 	"golang.org/x/crypto/pbkdf2"
 )
 
diff --git a/pkg/cluster/etcd.go b/pkg/cluster/etcd.go
index 18d2130a56..9c245d24eb 100644
--- a/pkg/cluster/etcd.go
+++ b/pkg/cluster/etcd.go
@@ -1,8 +1,8 @@
 package cluster
 
 import (
-	"github.com/rancher/k3s/pkg/cluster/managed"
-	"github.com/rancher/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/cluster/managed"
+	"github.com/k3s-io/k3s/pkg/etcd"
 )
 
 func init() {
diff --git a/pkg/cluster/https.go b/pkg/cluster/https.go
index 84e321f3b4..e26bb85114 100644
--- a/pkg/cluster/https.go
+++ b/pkg/cluster/https.go
@@ -11,14 +11,14 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/rancher/dynamiclistener"
 	"github.com/rancher/dynamiclistener/factory"
 	"github.com/rancher/dynamiclistener/storage/file"
 	"github.com/rancher/dynamiclistener/storage/kubernetes"
 	"github.com/rancher/dynamiclistener/storage/memory"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/etcd"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/generated/controllers/core"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/cluster/managed.go b/pkg/cluster/managed.go
index 222b9ae4fe..c07a946d4b 100644
--- a/pkg/cluster/managed.go
+++ b/pkg/cluster/managed.go
@@ -12,11 +12,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/cluster/managed"
+	"github.com/k3s-io/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/nodepassword"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/k3s-io/kine/pkg/endpoint"
-	"github.com/rancher/k3s/pkg/cluster/managed"
-	"github.com/rancher/k3s/pkg/etcd"
-	"github.com/rancher/k3s/pkg/nodepassword"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 )
diff --git a/pkg/cluster/managed/drivers.go b/pkg/cluster/managed/drivers.go
index 46df7bc509..5e844e0975 100644
--- a/pkg/cluster/managed/drivers.go
+++ b/pkg/cluster/managed/drivers.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 var (
diff --git a/pkg/cluster/storage.go b/pkg/cluster/storage.go
index baecbc5507..caecad0b21 100644
--- a/pkg/cluster/storage.go
+++ b/pkg/cluster/storage.go
@@ -9,10 +9,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/k3s-io/k3s/pkg/bootstrap"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/k3s-io/kine/pkg/client"
-	"github.com/rancher/k3s/pkg/bootstrap"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/codegen/main.go b/pkg/codegen/main.go
index d3067cd15a..e9b6e370de 100644
--- a/pkg/codegen/main.go
+++ b/pkg/codegen/main.go
@@ -4,14 +4,14 @@ import (
 	"os"
 
 	bindata "github.com/go-bindata/go-bindata"
-	v1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
+	v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
 	controllergen "github.com/rancher/wrangler/pkg/controller-gen"
 	"github.com/rancher/wrangler/pkg/controller-gen/args"
 	"github.com/sirupsen/logrus"
 )
 
 var (
-	basePackage = "github.com/rancher/k3s/types"
+	basePackage = "github.com/k3s-io/k3s/types"
 )
 
 func main() {
@@ -68,7 +68,7 @@ func main() {
 	}
 
 	controllergen.Run(args.Options{
-		OutputPackage: "github.com/rancher/k3s/pkg/generated",
+		OutputPackage: "github.com/k3s-io/k3s/pkg/generated",
 		Boilerplate:   "scripts/boilerplate.go.txt",
 		Groups: map[string]args.Group{
 			"k3s.cattle.io": {
diff --git a/pkg/configfilearg/defaultparser.go b/pkg/configfilearg/defaultparser.go
index 516d0b53ab..bbc44cb087 100644
--- a/pkg/configfilearg/defaultparser.go
+++ b/pkg/configfilearg/defaultparser.go
@@ -1,8 +1,8 @@
 package configfilearg
 
 import (
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/pkg/configfilearg/parser.go b/pkg/configfilearg/parser.go
index 15e85b4c43..ff9b708b88 100644
--- a/pkg/configfilearg/parser.go
+++ b/pkg/configfilearg/parser.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rancher/k3s/pkg/agent/util"
+	"github.com/k3s-io/k3s/pkg/agent/util"
 	"github.com/rancher/wrangler/pkg/data/convert"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
diff --git a/pkg/containerd/utility_windows.go b/pkg/containerd/utility_windows.go
index c80b807635..13a58e55bf 100644
--- a/pkg/containerd/utility_windows.go
+++ b/pkg/containerd/utility_windows.go
@@ -1,10 +1,11 @@
+//go:build windows
 // +build windows
 
 package containerd
 
 import (
+	util2 "github.com/k3s-io/k3s/pkg/util"
 	"github.com/pkg/errors"
-	util2 "github.com/rancher/k3s/pkg/util"
 )
 
 func OverlaySupported(root string) error {
diff --git a/pkg/daemons/agent/agent.go b/pkg/daemons/agent/agent.go
index 3ed92e3a44..c91682e5c1 100644
--- a/pkg/daemons/agent/agent.go
+++ b/pkg/daemons/agent/agent.go
@@ -6,10 +6,10 @@ import (
 	"os"
 	"time"
 
-	"github.com/rancher/k3s/pkg/agent/config"
-	"github.com/rancher/k3s/pkg/agent/proxy"
-	daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/executor"
+	"github.com/k3s-io/k3s/pkg/agent/config"
+	"github.com/k3s-io/k3s/pkg/agent/proxy"
+	daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/executor"
 	"github.com/sirupsen/logrus"
 	"k8s.io/component-base/logs"
 	_ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration
diff --git a/pkg/daemons/agent/agent_linux.go b/pkg/daemons/agent/agent_linux.go
index 4a04e57549..a93d71abb3 100644
--- a/pkg/daemons/agent/agent_linux.go
+++ b/pkg/daemons/agent/agent_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package agent
@@ -7,10 +8,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/k3s-io/k3s/pkg/cgroups"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/util"
 	"github.com/opencontainers/runc/libcontainer/userns"
-	"github.com/rancher/k3s/pkg/cgroups"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/util"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 	"k8s.io/apimachinery/pkg/util/net"
diff --git a/pkg/daemons/agent/agent_windows.go b/pkg/daemons/agent/agent_windows.go
index 0af9435f61..eb6feca6dc 100644
--- a/pkg/daemons/agent/agent_windows.go
+++ b/pkg/daemons/agent/agent_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package agent
@@ -9,8 +10,8 @@ import (
 	"time"
 
 	"github.com/Microsoft/hcsshim"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/util"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
diff --git a/pkg/daemons/agent/agent_windows_test.go b/pkg/daemons/agent/agent_windows_test.go
index d77b3506b9..9a058d6d10 100644
--- a/pkg/daemons/agent/agent_windows_test.go
+++ b/pkg/daemons/agent/agent_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package agent
@@ -5,7 +6,7 @@ package agent
 import (
 	"testing"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func TestCheckRuntimeEndpoint(t *testing.T) {
diff --git a/pkg/daemons/control/auth.go b/pkg/daemons/control/auth.go
index b7364c419e..c78839f8bf 100644
--- a/pkg/daemons/control/auth.go
+++ b/pkg/daemons/control/auth.go
@@ -1,8 +1,8 @@
 package control
 
 import (
-	"github.com/rancher/k3s/pkg/authenticator/basicauth"
-	"github.com/rancher/k3s/pkg/authenticator/passwordfile"
+	"github.com/k3s-io/k3s/pkg/authenticator/basicauth"
+	"github.com/k3s-io/k3s/pkg/authenticator/passwordfile"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/group"
 	"k8s.io/apiserver/pkg/authentication/request/union"
diff --git a/pkg/daemons/control/deps/deps.go b/pkg/daemons/control/deps/deps.go
index f23fb9f3d1..943d166249 100644
--- a/pkg/daemons/control/deps/deps.go
+++ b/pkg/daemons/control/deps/deps.go
@@ -18,12 +18,12 @@ import (
 	"text/template"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/passwd"
+	"github.com/k3s-io/k3s/pkg/token"
+	"github.com/k3s-io/k3s/pkg/version"
 	certutil "github.com/rancher/dynamiclistener/cert"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/passwd"
-	"github.com/rancher/k3s/pkg/token"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
diff --git a/pkg/daemons/control/server.go b/pkg/daemons/control/server.go
index 3275080639..b380687f30 100644
--- a/pkg/daemons/control/server.go
+++ b/pkg/daemons/control/server.go
@@ -10,13 +10,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/cluster"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/control/deps"
+	"github.com/k3s-io/k3s/pkg/daemons/executor"
+	"github.com/k3s-io/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/cluster"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/control/deps"
-	"github.com/rancher/k3s/pkg/daemons/executor"
-	"github.com/rancher/k3s/pkg/util"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	authorizationv1 "k8s.io/api/authorization/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/daemons/executor/embed.go b/pkg/daemons/executor/embed.go
index 8ae900836f..eaca255033 100644
--- a/pkg/daemons/executor/embed.go
+++ b/pkg/daemons/executor/embed.go
@@ -1,3 +1,4 @@
+//go:build !no_embedded_executor
 // +build !no_embedded_executor
 
 package executor
@@ -9,9 +10,9 @@ import (
 	"net/http"
 	"runtime"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -34,7 +35,7 @@ import (
 	kubelet "k8s.io/kubernetes/cmd/kubelet/app"
 
 	// registering k3s cloud provider
-	_ "github.com/rancher/k3s/pkg/cloudprovider"
+	_ "github.com/k3s-io/k3s/pkg/cloudprovider"
 )
 
 func init() {
diff --git a/pkg/daemons/executor/etcd.go b/pkg/daemons/executor/etcd.go
index c6b4910142..4c9c771d64 100644
--- a/pkg/daemons/executor/etcd.go
+++ b/pkg/daemons/executor/etcd.go
@@ -6,8 +6,8 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/version"
+	daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	"go.etcd.io/etcd/server/v3/embed"
 	"go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp"
diff --git a/pkg/daemons/executor/executor.go b/pkg/daemons/executor/executor.go
index 8404c5a374..a84fc25999 100644
--- a/pkg/daemons/executor/executor.go
+++ b/pkg/daemons/executor/executor.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
 	yaml2 "gopkg.in/yaml.v2"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"sigs.k8s.io/yaml"
diff --git a/pkg/datadir/datadir.go b/pkg/datadir/datadir.go
index ce02cb7bef..7afc1665bd 100644
--- a/pkg/datadir/datadir.go
+++ b/pkg/datadir/datadir.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/resolvehome"
 )
 
diff --git a/pkg/deploy/controller.go b/pkg/deploy/controller.go
index 5a3dd47d36..79f038fa77 100644
--- a/pkg/deploy/controller.go
+++ b/pkg/deploy/controller.go
@@ -14,11 +14,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/agent/util"
+	apisv1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
+	controllersv1 "github.com/k3s-io/k3s/pkg/generated/controllers/k3s.cattle.io/v1"
+	pkgutil "github.com/k3s-io/k3s/pkg/util"
 	errors2 "github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/util"
-	apisv1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
-	controllersv1 "github.com/rancher/k3s/pkg/generated/controllers/k3s.cattle.io/v1"
-	pkgutil "github.com/rancher/k3s/pkg/util"
 	"github.com/rancher/wrangler/pkg/apply"
 	"github.com/rancher/wrangler/pkg/merr"
 	"github.com/rancher/wrangler/pkg/objectset"
diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go
index 1910b63ed5..ebfe93e294 100644
--- a/pkg/etcd/etcd.go
+++ b/pkg/etcd/etcd.go
@@ -22,17 +22,17 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/control/deps"
+	"github.com/k3s-io/k3s/pkg/daemons/executor"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/k3s-io/kine/pkg/client"
 	endpoint2 "github.com/k3s-io/kine/pkg/endpoint"
 	"github.com/minio/minio-go/v7"
 	cp "github.com/otiai10/copy"
 	"github.com/pkg/errors"
 	certutil "github.com/rancher/dynamiclistener/cert"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/control/deps"
-	"github.com/rancher/k3s/pkg/daemons/executor"
-	"github.com/rancher/k3s/pkg/version"
 	controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	"github.com/robfig/cron/v3"
 	"github.com/sirupsen/logrus"
diff --git a/pkg/etcd/etcd_test.go b/pkg/etcd/etcd_test.go
index e8beabaa2f..e673d1de91 100644
--- a/pkg/etcd/etcd_test.go
+++ b/pkg/etcd/etcd_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	testutil "github.com/rancher/k3s/tests/util"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	testutil "github.com/k3s-io/k3s/tests/util"
 	"github.com/robfig/cron/v3"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/server/v3/etcdserver"
diff --git a/pkg/etcd/etcdproxy.go b/pkg/etcd/etcdproxy.go
index fe61a4a13d..46ec6dcaf6 100644
--- a/pkg/etcd/etcdproxy.go
+++ b/pkg/etcd/etcdproxy.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"net/url"
 
+	"github.com/k3s-io/k3s/pkg/agent/loadbalancer"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/loadbalancer"
 )
 
 type Proxy interface {
diff --git a/pkg/etcd/member_controller.go b/pkg/etcd/member_controller.go
index c355897ad0..b2aa3a5c0b 100644
--- a/pkg/etcd/member_controller.go
+++ b/pkg/etcd/member_controller.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
diff --git a/pkg/etcd/s3.go b/pkg/etcd/s3.go
index 3a8d5ccf2d..573809f131 100644
--- a/pkg/etcd/s3.go
+++ b/pkg/etcd/s3.go
@@ -16,10 +16,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/daemons/config"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/flock/flock_int_test.go b/pkg/flock/flock_int_test.go
index ffd6c12432..aed7bbbe92 100644
--- a/pkg/flock/flock_int_test.go
+++ b/pkg/flock/flock_int_test.go
@@ -1,11 +1,14 @@
+//go:build linux || darwin || freebsd || openbsd || netbsd || dragonfly
+// +build linux darwin freebsd openbsd netbsd dragonfly
+
 package flock_test
 
 import (
 	"testing"
 
+	"github.com/k3s-io/k3s/pkg/flock"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/rancher/k3s/pkg/flock"
 )
 
 const lockfile = "/tmp/testlock.test"
diff --git a/pkg/flock/flock_other.go b/pkg/flock/flock_other.go
index 0082423ceb..dfb7d03a6e 100644
--- a/pkg/flock/flock_other.go
+++ b/pkg/flock/flock_other.go
@@ -1,3 +1,4 @@
+//go:build !linux && !darwin && !freebsd && !openbsd && !netbsd && !dragonfly
 // +build !linux,!darwin,!freebsd,!openbsd,!netbsd,!dragonfly
 
 /*
@@ -23,7 +24,18 @@ func Acquire(path string) (int, error) {
 	return -1, nil
 }
 
+// AcquireShared creates a shared lock on a file for the duration of the process, or until Release(d).
+// This method is reentrant.
+func AcquireShared(path string) (int, error) {
+	return 0, nil
+}
+
 // Release is not implemented on non-unix systems.
 func Release(lock int) error {
 	return nil
 }
+
+// CheckLock checks whether any process is using the lock
+func CheckLock(path string) bool {
+	return false
+}
diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go
index 817fc32b0d..89171e03e1 100644
--- a/pkg/generated/clientset/versioned/clientset.go
+++ b/pkg/generated/clientset/versioned/clientset.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"net/http"
 
-	k3sv1 "github.com/rancher/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1"
+	k3sv1 "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1"
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"
diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go
index 94036832f7..270adfe162 100644
--- a/pkg/generated/clientset/versioned/fake/clientset_generated.go
+++ b/pkg/generated/clientset/versioned/fake/clientset_generated.go
@@ -19,9 +19,9 @@ limitations under the License.
 package fake
 
 import (
-	clientset "github.com/rancher/k3s/pkg/generated/clientset/versioned"
-	k3sv1 "github.com/rancher/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1"
-	fakek3sv1 "github.com/rancher/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake"
+	clientset "github.com/k3s-io/k3s/pkg/generated/clientset/versioned"
+	k3sv1 "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1"
+	fakek3sv1 "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/discovery"
diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go
index ec60f9be6c..e923f62e92 100644
--- a/pkg/generated/clientset/versioned/fake/register.go
+++ b/pkg/generated/clientset/versioned/fake/register.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	k3sv1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
+	k3sv1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go
index 429832fa15..a841db26cd 100644
--- a/pkg/generated/clientset/versioned/scheme/register.go
+++ b/pkg/generated/clientset/versioned/scheme/register.go
@@ -19,7 +19,7 @@ limitations under the License.
 package scheme
 
 import (
-	k3sv1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
+	k3sv1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/addon.go b/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/addon.go
index 7e79fa35d8..3af9c27f94 100644
--- a/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/addon.go
+++ b/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/addon.go
@@ -22,8 +22,8 @@ import (
 	"context"
 	"time"
 
-	v1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
-	scheme "github.com/rancher/k3s/pkg/generated/clientset/versioned/scheme"
+	v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
+	scheme "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake/fake_addon.go b/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake/fake_addon.go
index 47db1b9716..ac1a4c58b6 100644
--- a/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake/fake_addon.go
+++ b/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake/fake_addon.go
@@ -21,7 +21,7 @@ package fake
 import (
 	"context"
 
-	k3scattleiov1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
+	k3scattleiov1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake/fake_k3s.cattle.io_client.go b/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake/fake_k3s.cattle.io_client.go
index 778ae547c8..562baa9638 100644
--- a/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake/fake_k3s.cattle.io_client.go
+++ b/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake/fake_k3s.cattle.io_client.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	v1 "github.com/rancher/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1"
+	v1 "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1"
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
 )
diff --git a/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/k3s.cattle.io_client.go b/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/k3s.cattle.io_client.go
index 7a2c6fb138..a1e0d1fbaf 100644
--- a/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/k3s.cattle.io_client.go
+++ b/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/k3s.cattle.io_client.go
@@ -21,8 +21,8 @@ package v1
 import (
 	"net/http"
 
-	v1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
-	"github.com/rancher/k3s/pkg/generated/clientset/versioned/scheme"
+	v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
+	"github.com/k3s-io/k3s/pkg/generated/clientset/versioned/scheme"
 	rest "k8s.io/client-go/rest"
 )
 
diff --git a/pkg/generated/controllers/k3s.cattle.io/interface.go b/pkg/generated/controllers/k3s.cattle.io/interface.go
index d327e83d26..9e54be64f8 100644
--- a/pkg/generated/controllers/k3s.cattle.io/interface.go
+++ b/pkg/generated/controllers/k3s.cattle.io/interface.go
@@ -19,7 +19,7 @@ limitations under the License.
 package k3s
 
 import (
-	v1 "github.com/rancher/k3s/pkg/generated/controllers/k3s.cattle.io/v1"
+	v1 "github.com/k3s-io/k3s/pkg/generated/controllers/k3s.cattle.io/v1"
 	"github.com/rancher/lasso/pkg/controller"
 )
 
diff --git a/pkg/generated/controllers/k3s.cattle.io/v1/addon.go b/pkg/generated/controllers/k3s.cattle.io/v1/addon.go
index bc0250615a..ba056beef6 100644
--- a/pkg/generated/controllers/k3s.cattle.io/v1/addon.go
+++ b/pkg/generated/controllers/k3s.cattle.io/v1/addon.go
@@ -22,7 +22,7 @@ import (
 	"context"
 	"time"
 
-	v1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
+	v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
 	"github.com/rancher/lasso/pkg/client"
 	"github.com/rancher/lasso/pkg/controller"
 	"github.com/rancher/wrangler/pkg/apply"
diff --git a/pkg/generated/controllers/k3s.cattle.io/v1/interface.go b/pkg/generated/controllers/k3s.cattle.io/v1/interface.go
index a8b64d3886..c8d31ea5d1 100644
--- a/pkg/generated/controllers/k3s.cattle.io/v1/interface.go
+++ b/pkg/generated/controllers/k3s.cattle.io/v1/interface.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	v1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
+	v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
 	"github.com/rancher/lasso/pkg/controller"
 	"github.com/rancher/wrangler/pkg/schemes"
 	"k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/kubectl/main.go b/pkg/kubectl/main.go
index ba98324536..e45809f5bf 100644
--- a/pkg/kubectl/main.go
+++ b/pkg/kubectl/main.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rancher/k3s/pkg/server"
+	"github.com/k3s-io/k3s/pkg/server"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 	utilflag "k8s.io/component-base/cli/flag"
diff --git a/pkg/node/controller.go b/pkg/node/controller.go
index 0ec5086d94..478de8ea18 100644
--- a/pkg/node/controller.go
+++ b/pkg/node/controller.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"strings"
 
+	"github.com/k3s-io/k3s/pkg/nodepassword"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/nodepassword"
 	coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	"github.com/sirupsen/logrus"
 	core "k8s.io/api/core/v1"
diff --git a/pkg/nodeconfig/nodeconfig.go b/pkg/nodeconfig/nodeconfig.go
index 6d21733ba5..42dff107da 100644
--- a/pkg/nodeconfig/nodeconfig.go
+++ b/pkg/nodeconfig/nodeconfig.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"strings"
 
+	"github.com/k3s-io/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/configfilearg"
-	"github.com/rancher/k3s/pkg/version"
 	corev1 "k8s.io/api/core/v1"
 )
 
diff --git a/pkg/nodeconfig/nodeconfig_test.go b/pkg/nodeconfig/nodeconfig_test.go
index 4673167e3b..ef1c2dca60 100644
--- a/pkg/nodeconfig/nodeconfig_test.go
+++ b/pkg/nodeconfig/nodeconfig_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/nodepassword/nodepassword.go b/pkg/nodepassword/nodepassword.go
index ddec742d12..a9c93543a1 100644
--- a/pkg/nodepassword/nodepassword.go
+++ b/pkg/nodepassword/nodepassword.go
@@ -6,10 +6,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/authenticator/hash"
+	"github.com/k3s-io/k3s/pkg/passwd"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/authenticator/hash"
-	"github.com/rancher/k3s/pkg/passwd"
-	"github.com/rancher/k3s/pkg/version"
 	coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
diff --git a/pkg/passwd/passwd.go b/pkg/passwd/passwd.go
index 7d42c650f7..62a0445560 100644
--- a/pkg/passwd/passwd.go
+++ b/pkg/passwd/passwd.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/rancher/k3s/pkg/token"
-	"github.com/rancher/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/token"
+	"github.com/k3s-io/k3s/pkg/util"
 )
 
 type entry struct {
diff --git a/pkg/rootless/rootless.go b/pkg/rootless/rootless.go
index d81ed00b3b..4b26e9f4f3 100644
--- a/pkg/rootless/rootless.go
+++ b/pkg/rootless/rootless.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package rootless
@@ -83,7 +84,7 @@ func validateSysctl() error {
 
 		// net.ipv4.ip_forward should not need to be 1 in the parent namespace.
 		// However, the current k3s implementation has a bug that requires net.ipv4.ip_forward=1
-		// https://github.com/rancher/k3s/issues/2420#issuecomment-715051120
+		// https://github.com/k3s-io/k3s/issues/2420#issuecomment-715051120
 		"net.ipv4.ip_forward": "1",
 	}
 	for key, expectedValue := range expected {
diff --git a/pkg/rootlessports/controller.go b/pkg/rootlessports/controller.go
index 7b74740139..d449fd048b 100644
--- a/pkg/rootlessports/controller.go
+++ b/pkg/rootlessports/controller.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package rootlessports
@@ -6,7 +7,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/rancher/k3s/pkg/rootless"
+	"github.com/k3s-io/k3s/pkg/rootless"
 	coreClients "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	"github.com/rootless-containers/rootlesskit/pkg/api/client"
 	"github.com/rootless-containers/rootlesskit/pkg/port"
diff --git a/pkg/secretsencrypt/config.go b/pkg/secretsencrypt/config.go
index 1058db06cb..775c292230 100644
--- a/pkg/secretsencrypt/config.go
+++ b/pkg/secretsencrypt/config.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/version"
 	corev1 "k8s.io/api/core/v1"
 
 	"github.com/sirupsen/logrus"
diff --git a/pkg/secretsencrypt/controller.go b/pkg/secretsencrypt/controller.go
index 45fcb02e4b..1fe38b1cc5 100644
--- a/pkg/secretsencrypt/controller.go
+++ b/pkg/secretsencrypt/controller.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/rancher/k3s/pkg/cluster"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/cluster"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/util"
 	coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/server/auth.go b/pkg/server/auth.go
index 518e76a61a..8dee4ce110 100644
--- a/pkg/server/auth.go
+++ b/pkg/server/auth.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apiserver/pkg/endpoints/request"
 )
diff --git a/pkg/server/context.go b/pkg/server/context.go
index 25cf3b2775..22408cac78 100644
--- a/pkg/server/context.go
+++ b/pkg/server/context.go
@@ -7,10 +7,10 @@ import (
 	"runtime"
 
 	"github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io"
+	"github.com/k3s-io/k3s/pkg/deploy"
+	"github.com/k3s-io/k3s/pkg/generated/controllers/k3s.cattle.io"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/deploy"
-	"github.com/rancher/k3s/pkg/generated/controllers/k3s.cattle.io"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/apply"
 	"github.com/rancher/wrangler/pkg/crd"
 	"github.com/rancher/wrangler/pkg/generated/controllers/apps"
diff --git a/pkg/server/etcd.go b/pkg/server/etcd.go
index 670b4557d4..80251883c9 100644
--- a/pkg/server/etcd.go
+++ b/pkg/server/etcd.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/rancher/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/etcd"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/server/router.go b/pkg/server/router.go
index 20b9ef60b6..d98c01a683 100644
--- a/pkg/server/router.go
+++ b/pkg/server/router.go
@@ -16,13 +16,13 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
+	"github.com/k3s-io/k3s/pkg/bootstrap"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/nodepassword"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
 	certutil "github.com/rancher/dynamiclistener/cert"
-	"github.com/rancher/k3s/pkg/bootstrap"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/nodepassword"
-	"github.com/rancher/k3s/pkg/version"
 	coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/util/json"
diff --git a/pkg/server/secrets-encrypt.go b/pkg/server/secrets-encrypt.go
index dff66836e1..28f777a498 100644
--- a/pkg/server/secrets-encrypt.go
+++ b/pkg/server/secrets-encrypt.go
@@ -13,9 +13,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rancher/k3s/pkg/cluster"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/secretsencrypt"
+	"github.com/k3s-io/k3s/pkg/cluster"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/secretsencrypt"
 	"github.com/rancher/wrangler/pkg/generated/controllers/core"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/server/server.go b/pkg/server/server.go
index fea44af041..7fabcd8b90 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -14,22 +14,22 @@ import (
 	"time"
 
 	"github.com/k3s-io/helm-controller/pkg/helm"
+	"github.com/k3s-io/k3s/pkg/apiaddresses"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/control"
+	"github.com/k3s-io/k3s/pkg/datadir"
+	"github.com/k3s-io/k3s/pkg/deploy"
+	"github.com/k3s-io/k3s/pkg/node"
+	"github.com/k3s-io/k3s/pkg/nodepassword"
+	"github.com/k3s-io/k3s/pkg/rootlessports"
+	"github.com/k3s-io/k3s/pkg/secretsencrypt"
+	"github.com/k3s-io/k3s/pkg/servicelb"
+	"github.com/k3s-io/k3s/pkg/static"
+	"github.com/k3s-io/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/apiaddresses"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/control"
-	"github.com/rancher/k3s/pkg/datadir"
-	"github.com/rancher/k3s/pkg/deploy"
-	"github.com/rancher/k3s/pkg/node"
-	"github.com/rancher/k3s/pkg/nodepassword"
-	"github.com/rancher/k3s/pkg/rootlessports"
-	"github.com/rancher/k3s/pkg/secretsencrypt"
-	"github.com/rancher/k3s/pkg/servicelb"
-	"github.com/rancher/k3s/pkg/static"
-	"github.com/rancher/k3s/pkg/util"
-	"github.com/rancher/k3s/pkg/version"
 	v1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	"github.com/rancher/wrangler/pkg/leader"
 	"github.com/rancher/wrangler/pkg/resolvehome"
diff --git a/pkg/server/types.go b/pkg/server/types.go
index e6418a9cef..417e478441 100644
--- a/pkg/server/types.go
+++ b/pkg/server/types.go
@@ -3,8 +3,8 @@ package server
 import (
 	"context"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 type Config struct {
diff --git a/pkg/servicelb/controller.go b/pkg/servicelb/controller.go
index 18585f7b96..81b6d0a93d 100644
--- a/pkg/servicelb/controller.go
+++ b/pkg/servicelb/controller.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/apply"
 	"github.com/rancher/wrangler/pkg/condition"
 	appclient "github.com/rancher/wrangler/pkg/generated/controllers/apps/v1"
diff --git a/scripts/build b/scripts/build
index 139fb68746..05cac70322 100755
--- a/scripts/build
+++ b/scripts/build
@@ -7,7 +7,7 @@ cd $(dirname $0)/..
 
 GO=${GO-go}
 
-PKG="github.com/rancher/k3s"
+PKG="github.com/k3s-io/k3s"
 PKG_CONTAINERD="github.com/containerd/containerd"
 PKG_K3S_CONTAINERD="github.com/k3s-io/containerd"
 PKG_CRICTL="github.com/kubernetes-sigs/cri-tools/pkg"
diff --git a/scripts/build-tests-sonobuoy b/scripts/build-tests-sonobuoy
index 430dc8356e..6312e57b7d 100755
--- a/scripts/build-tests-sonobuoy
+++ b/scripts/build-tests-sonobuoy
@@ -14,7 +14,7 @@ PKG_TO_TEST=$(find ./pkg/ -type f -name "*_int_test.go" | sed -r 's|/[^/]+$||' |
 for i in $PKG_TO_TEST; do
     name=$(echo "${i##*/}")
     echo $name
-    go test -c -v -ldflags "-X 'github.com/rancher/k3s/tests/util.existingServer=True'" -o dist/artifacts/k3s-integration-$name.test $i -run Integration
+    go test -c -v -ldflags "-X 'github.com/k3s-io/k3s/tests/util.existingServer=True'" -o dist/artifacts/k3s-integration-$name.test $i -run Integration
 done
 
 # Integration tests under /tests
@@ -22,7 +22,7 @@ PKG_TO_TEST=$(find ./tests/integration -type f -name "*_int_test.go" | sed -r 's
 for i in $PKG_TO_TEST; do
     name=$(echo "${i##*/}")
     echo $name
-    go test -c -v -ldflags "-X 'github.com/rancher/k3s/tests/util.existingServer=True'" -o dist/artifacts/k3s-integration-$name.test $i -run Integration
+    go test -c -v -ldflags "-X 'github.com/k3s-io/k3s/tests/util.existingServer=True'" -o dist/artifacts/k3s-integration-$name.test $i -run Integration
 done
 docker build -f ./tests/integration/Dockerfile.test -t $REPO .
 docker save $REPO -o ./dist/artifacts/$REPO.tar
diff --git a/scripts/package-cli b/scripts/package-cli
index 6c36922c28..e65aa43dbc 100755
--- a/scripts/package-cli
+++ b/scripts/package-cli
@@ -52,8 +52,8 @@ CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX}
 
 "${GO}" generate
 LDFLAGS="
-    -X github.com/rancher/k3s/pkg/version.Version=$VERSION
-    -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8}
+    -X github.com/k3s-io/k3s/pkg/version.Version=$VERSION
+    -X github.com/k3s-io/k3s/pkg/version.GitCommit=${COMMIT:0:8}
     -w -s
 "
 STATIC="-extldflags '-static'"
diff --git a/tests/TESTING.md b/tests/TESTING.md
index 9917484044..9f447007e6 100644
--- a/tests/TESTING.md
+++ b/tests/TESTING.md
@@ -82,7 +82,7 @@ ginkgo --junit-report=result.xml ./tests/integration/...
 
 Integration tests can be run on an existing single-node cluster via compile time flag, tests will skip if the server is not configured correctly.
 ```bash
-go test -ldflags "-X 'github.com/rancher/k3s/tests/util.existingServer=True'" ./tests/integration/... -run Integration
+go test -ldflags "-X 'github.com/k3s-io/k3s/tests/util.existingServer=True'" ./tests/integration/... -run Integration
 ```
 
 Integration tests can also be run via a [Sonobuoy](https://sonobuoy.io/docs/v0.53.2/) plugin on an existing single-node cluster.
diff --git a/tests/e2e/Dockerfile.build b/tests/e2e/Dockerfile.build
index 6a96df285e..281b427d9e 100644
--- a/tests/e2e/Dockerfile.build
+++ b/tests/e2e/Dockerfile.build
@@ -18,7 +18,7 @@ RUN mkdir tmp && \
     chmod +x /usr/local/bin/terraform && \
     rm -rf tmp
 
-WORKDIR $GOPATH/src/github.com/rancher/k3s-io/k3s/tests/e2e
+WORKDIR $GOPATH/src/github.com/k3s-io/k3s-io/k3s/tests/e2e
 
 COPY . .
 
diff --git a/tests/e2e/go.mod b/tests/e2e/go.mod
index 8786b5c787..589bba4b6a 100644
--- a/tests/e2e/go.mod
+++ b/tests/e2e/go.mod
@@ -1,4 +1,4 @@
-module github.com/rancher/k3s/tests/e2e
+module github.com/k3s-io/k3s/tests/e2e
 
 go 1.15
 
diff --git a/tests/e2e/secretsencryption/secretsencryption_test.go b/tests/e2e/secretsencryption/secretsencryption_test.go
index 9b5bc61d96..8ead055998 100644
--- a/tests/e2e/secretsencryption/secretsencryption_test.go
+++ b/tests/e2e/secretsencryption/secretsencryption_test.go
@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/k3s-io/k3s/tests/e2e"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/rancher/k3s/tests/e2e"
 )
 
 // Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64, dweomer/microos.amd64
diff --git a/tests/e2e/upgradecluster/upgradecluster_test.go b/tests/e2e/upgradecluster/upgradecluster_test.go
index 28ae64a62b..afee907cbf 100644
--- a/tests/e2e/upgradecluster/upgradecluster_test.go
+++ b/tests/e2e/upgradecluster/upgradecluster_test.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/k3s-io/k3s/tests/e2e"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/rancher/k3s/tests/e2e"
 )
 
 // Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64, dweomer/microos.amd64
diff --git a/tests/e2e/validatecluster/validatecluster_test.go b/tests/e2e/validatecluster/validatecluster_test.go
index 98000c4f3e..9032242a29 100644
--- a/tests/e2e/validatecluster/validatecluster_test.go
+++ b/tests/e2e/validatecluster/validatecluster_test.go
@@ -9,7 +9,6 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/rancher/k3s/tests/e2e"
 )
 
 // Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64, dweomer/microos.amd64
diff --git a/tests/integration/Dockerfile.test b/tests/integration/Dockerfile.test
index cb9fc4c7f5..b533b3ea4b 100644
--- a/tests/integration/Dockerfile.test
+++ b/tests/integration/Dockerfile.test
@@ -6,7 +6,7 @@ RUN apt update && \
     apt install -y curl git lsof bash openssh-server gcc g++ make ca-certificates && \
     curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 
-WORKDIR $GOPATH/src/github.com/rancher/k3s-io/k3s/
+WORKDIR $GOPATH/src/github.com/k3s-io/k3s-io/k3s/
 
 COPY ./tests/testdata ./testdata
 COPY ./tests/integration/test-runner.sh .
diff --git a/tests/integration/custometcdargs/custometcdargs_int_test.go b/tests/integration/custometcdargs/custometcdargs_int_test.go
index d686e9076f..c1658254f9 100644
--- a/tests/integration/custometcdargs/custometcdargs_int_test.go
+++ b/tests/integration/custometcdargs/custometcdargs_int_test.go
@@ -5,9 +5,9 @@ import (
 	"strings"
 	"testing"
 
+	testutil "github.com/k3s-io/k3s/tests/util"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	testutil "github.com/rancher/k3s/tests/util"
 )
 
 var customEtcdArgsServer *testutil.K3sServer
diff --git a/tests/integration/dualstack/dualstack_int_test.go b/tests/integration/dualstack/dualstack_int_test.go
index 4ec2fa91fa..a4797d6eb9 100644
--- a/tests/integration/dualstack/dualstack_int_test.go
+++ b/tests/integration/dualstack/dualstack_int_test.go
@@ -5,9 +5,9 @@ import (
 	"strings"
 	"testing"
 
+	testutil "github.com/k3s-io/k3s/tests/util"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	testutil "github.com/rancher/k3s/tests/util"
 )
 
 var dualStackServer *testutil.K3sServer
diff --git a/tests/integration/etcdrestore/etcd_restore_int_test.go b/tests/integration/etcdrestore/etcd_restore_int_test.go
index 253f273929..dc33848740 100644
--- a/tests/integration/etcdrestore/etcd_restore_int_test.go
+++ b/tests/integration/etcdrestore/etcd_restore_int_test.go
@@ -4,9 +4,9 @@ import (
 	"strings"
 	"testing"
 
+	testutil "github.com/k3s-io/k3s/tests/util"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	testutil "github.com/rancher/k3s/tests/util"
 )
 
 var server1, server2 *testutil.K3sServer
diff --git a/tests/integration/etcdsnapshot/etcdsnapshot_int_test.go b/tests/integration/etcdsnapshot/etcdsnapshot_int_test.go
index a7a1a36c8b..d5cb8f755a 100644
--- a/tests/integration/etcdsnapshot/etcdsnapshot_int_test.go
+++ b/tests/integration/etcdsnapshot/etcdsnapshot_int_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
+	testutil "github.com/k3s-io/k3s/tests/util"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	testutil "github.com/rancher/k3s/tests/util"
 )
 
 var server *testutil.K3sServer
diff --git a/tests/integration/localstorage/localstorage_int_test.go b/tests/integration/localstorage/localstorage_int_test.go
index 192f76005e..6b75b7cb79 100644
--- a/tests/integration/localstorage/localstorage_int_test.go
+++ b/tests/integration/localstorage/localstorage_int_test.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"testing"
 
+	testutil "github.com/k3s-io/k3s/tests/util"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	testutil "github.com/rancher/k3s/tests/util"
 )
 
 var localStorageServer *testutil.K3sServer
diff --git a/tests/integration/secretsencryption/secretsencryption_int_test.go b/tests/integration/secretsencryption/secretsencryption_int_test.go
index f73fc92ff1..e587c1a541 100644
--- a/tests/integration/secretsencryption/secretsencryption_int_test.go
+++ b/tests/integration/secretsencryption/secretsencryption_int_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
+	testutil "github.com/k3s-io/k3s/tests/util"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	testutil "github.com/rancher/k3s/tests/util"
 )
 
 var secretsEncryptionServer *testutil.K3sServer
diff --git a/tests/util/integration.go b/tests/util/integration.go
index 4e30c0cb30..0c40c459b1 100644
--- a/tests/util/integration.go
+++ b/tests/util/integration.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/k3s-io/k3s/pkg/flock"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/flock"
 	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )
diff --git a/tests/util/unit.go b/tests/util/unit.go
index e4a6982536..907d33858f 100644
--- a/tests/util/unit.go
+++ b/tests/util/unit.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/control/deps"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/control/deps"
 )
 
 // GenerateDataDir creates a temporary directory at "/tmp/k3s/<RANDOM_STRING>/".