diff --git a/cmd/helm/chart.go b/cmd/helm/chart.go
index e66e6be3c..96082ab3e 100644
--- a/cmd/helm/chart.go
+++ b/cmd/helm/chart.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const chartHelp = `
diff --git a/cmd/helm/chart_export.go b/cmd/helm/chart_export.go
index b1f790205..67caf08d7 100644
--- a/cmd/helm/chart_export.go
+++ b/cmd/helm/chart_export.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const chartExportDesc = `
diff --git a/cmd/helm/chart_list.go b/cmd/helm/chart_list.go
index 78931603a..a9d01c9bd 100644
--- a/cmd/helm/chart_list.go
+++ b/cmd/helm/chart_list.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const chartListDesc = `
diff --git a/cmd/helm/chart_pull.go b/cmd/helm/chart_pull.go
index bb90366cb..760ff3e2c 100644
--- a/cmd/helm/chart_pull.go
+++ b/cmd/helm/chart_pull.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const chartPullDesc = `
diff --git a/cmd/helm/chart_push.go b/cmd/helm/chart_push.go
index 21fbe0e1f..ff34632b1 100644
--- a/cmd/helm/chart_push.go
+++ b/cmd/helm/chart_push.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const chartPushDesc = `
diff --git a/cmd/helm/chart_remove.go b/cmd/helm/chart_remove.go
index 43e463c6a..d952951fb 100644
--- a/cmd/helm/chart_remove.go
+++ b/cmd/helm/chart_remove.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const chartRemoveDesc = `
diff --git a/cmd/helm/chart_save.go b/cmd/helm/chart_save.go
index 81a9d57ca..35b72cd07 100644
--- a/cmd/helm/chart_save.go
+++ b/cmd/helm/chart_save.go
@@ -22,9 +22,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/chart/loader"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/chart/loader"
 )
 
 const chartSaveDesc = `
diff --git a/cmd/helm/create.go b/cmd/helm/create.go
index 0034e4f52..65e142097 100644
--- a/cmd/helm/create.go
+++ b/cmd/helm/create.go
@@ -23,10 +23,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/helmpath"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/helmpath"
 )
 
 const createDesc = `
diff --git a/cmd/helm/create_test.go b/cmd/helm/create_test.go
index 962030aec..d9b312262 100644
--- a/cmd/helm/create_test.go
+++ b/cmd/helm/create_test.go
@@ -23,11 +23,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/helmpath"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/helmpath"
 )
 
 func TestCreateCmd(t *testing.T) {
diff --git a/cmd/helm/dependency.go b/cmd/helm/dependency.go
index 3942d9b19..2cc4c5045 100644
--- a/cmd/helm/dependency.go
+++ b/cmd/helm/dependency.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const dependencyDesc = `
diff --git a/cmd/helm/dependency_build.go b/cmd/helm/dependency_build.go
index 6f5e20613..478b49479 100644
--- a/cmd/helm/dependency_build.go
+++ b/cmd/helm/dependency_build.go
@@ -23,10 +23,10 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/util/homedir"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/downloader"
-	"helm.sh/helm/pkg/getter"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/downloader"
+	"helm.sh/helm/v3/pkg/getter"
 )
 
 const dependencyBuildDesc = `
diff --git a/cmd/helm/dependency_build_test.go b/cmd/helm/dependency_build_test.go
index 0f131bdf3..58ef3d3a1 100644
--- a/cmd/helm/dependency_build_test.go
+++ b/cmd/helm/dependency_build_test.go
@@ -22,9 +22,9 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/pkg/provenance"
-	"helm.sh/helm/pkg/repo"
-	"helm.sh/helm/pkg/repo/repotest"
+	"helm.sh/helm/v3/pkg/provenance"
+	"helm.sh/helm/v3/pkg/repo"
+	"helm.sh/helm/v3/pkg/repo/repotest"
 )
 
 func TestDependencyBuildCmd(t *testing.T) {
diff --git a/cmd/helm/dependency_update.go b/cmd/helm/dependency_update.go
index c86c2f9e2..9855afb92 100644
--- a/cmd/helm/dependency_update.go
+++ b/cmd/helm/dependency_update.go
@@ -21,10 +21,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/downloader"
-	"helm.sh/helm/pkg/getter"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/downloader"
+	"helm.sh/helm/v3/pkg/getter"
 )
 
 const dependencyUpDesc = `
diff --git a/cmd/helm/dependency_update_test.go b/cmd/helm/dependency_update_test.go
index 9cbd4f029..cf9ad7ba4 100644
--- a/cmd/helm/dependency_update_test.go
+++ b/cmd/helm/dependency_update_test.go
@@ -23,13 +23,13 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/helmpath"
-	"helm.sh/helm/pkg/provenance"
-	"helm.sh/helm/pkg/repo"
-	"helm.sh/helm/pkg/repo/repotest"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/provenance"
+	"helm.sh/helm/v3/pkg/repo"
+	"helm.sh/helm/v3/pkg/repo/repotest"
 )
 
 func TestDependencyUpdateCmd(t *testing.T) {
diff --git a/cmd/helm/docs.go b/cmd/helm/docs.go
index e3846eeb3..7eb9c1c88 100644
--- a/cmd/helm/docs.go
+++ b/cmd/helm/docs.go
@@ -23,7 +23,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 
-	"helm.sh/helm/cmd/helm/require"
+	"helm.sh/helm/v3/cmd/helm/require"
 )
 
 const docsDesc = `
diff --git a/cmd/helm/env.go b/cmd/helm/env.go
index 4078a000b..1881ac91d 100644
--- a/cmd/helm/env.go
+++ b/cmd/helm/env.go
@@ -20,11 +20,11 @@ import (
 	"fmt"
 	"io"
 
-	"helm.sh/helm/pkg/cli"
+	"helm.sh/helm/v3/pkg/cli"
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
+	"helm.sh/helm/v3/cmd/helm/require"
 )
 
 var (
diff --git a/cmd/helm/flags.go b/cmd/helm/flags.go
index 042484a29..b0552c7fd 100644
--- a/cmd/helm/flags.go
+++ b/cmd/helm/flags.go
@@ -22,8 +22,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/cli/values"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/cli/values"
 )
 
 const outputFlag = "output"
diff --git a/cmd/helm/get.go b/cmd/helm/get.go
index acbe5fe27..fb7fef233 100644
--- a/cmd/helm/get.go
+++ b/cmd/helm/get.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 var getHelp = `
diff --git a/cmd/helm/get_hooks.go b/cmd/helm/get_hooks.go
index 82a375dab..4ec48bb2c 100644
--- a/cmd/helm/get_hooks.go
+++ b/cmd/helm/get_hooks.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const getHooksHelp = `
diff --git a/cmd/helm/get_hooks_test.go b/cmd/helm/get_hooks_test.go
index 990ae77be..f843f7d59 100644
--- a/cmd/helm/get_hooks_test.go
+++ b/cmd/helm/get_hooks_test.go
@@ -19,7 +19,7 @@ package main
 import (
 	"testing"
 
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 func TestGetHooks(t *testing.T) {
diff --git a/cmd/helm/get_manifest.go b/cmd/helm/get_manifest.go
index c9e13ee98..d8fcd2e2c 100644
--- a/cmd/helm/get_manifest.go
+++ b/cmd/helm/get_manifest.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 var getManifestHelp = `
diff --git a/cmd/helm/get_manifest_test.go b/cmd/helm/get_manifest_test.go
index 93a0bbd6d..be54d4a5b 100644
--- a/cmd/helm/get_manifest_test.go
+++ b/cmd/helm/get_manifest_test.go
@@ -19,7 +19,7 @@ package main
 import (
 	"testing"
 
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 func TestGetManifest(t *testing.T) {
diff --git a/cmd/helm/get_test.go b/cmd/helm/get_test.go
index 6fc7d6e32..1279c5f7f 100644
--- a/cmd/helm/get_test.go
+++ b/cmd/helm/get_test.go
@@ -19,7 +19,7 @@ package main
 import (
 	"testing"
 
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 func TestGetCmd(t *testing.T) {
diff --git a/cmd/helm/get_values.go b/cmd/helm/get_values.go
index 1f998dbf0..31e1e3711 100644
--- a/cmd/helm/get_values.go
+++ b/cmd/helm/get_values.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 var getValuesHelp = `
diff --git a/cmd/helm/get_values_test.go b/cmd/helm/get_values_test.go
index 9673e5312..ee77053e4 100644
--- a/cmd/helm/get_values_test.go
+++ b/cmd/helm/get_values_test.go
@@ -19,7 +19,7 @@ package main
 import (
 	"testing"
 
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 func TestGetValuesCmd(t *testing.T) {
diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index e1ce1ad28..509ab3241 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main // import "helm.sh/helm/cmd/helm"
+package main // import "helm.sh/helm/v3/cmd/helm"
 
 import (
 	"flag"
@@ -32,12 +32,12 @@ import (
 	// Import to initialize client auth plugins.
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/cli"
-	"helm.sh/helm/pkg/gates"
-	"helm.sh/helm/pkg/kube"
-	"helm.sh/helm/pkg/storage"
-	"helm.sh/helm/pkg/storage/driver"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/cli"
+	"helm.sh/helm/v3/pkg/gates"
+	"helm.sh/helm/v3/pkg/kube"
+	"helm.sh/helm/v3/pkg/storage"
+	"helm.sh/helm/v3/pkg/storage/driver"
 )
 
 // FeatureGateOCI is the feature gate for checking if `helm chart` and `helm registry` commands should work
diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go
index 0abadacb7..fc4a3a879 100644
--- a/cmd/helm/helm_test.go
+++ b/cmd/helm/helm_test.go
@@ -27,13 +27,13 @@ import (
 	shellwords "github.com/mattn/go-shellwords"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/internal/test"
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/chartutil"
-	kubefake "helm.sh/helm/pkg/kube/fake"
-	"helm.sh/helm/pkg/release"
-	"helm.sh/helm/pkg/storage"
-	"helm.sh/helm/pkg/storage/driver"
+	"helm.sh/helm/v3/internal/test"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/chartutil"
+	kubefake "helm.sh/helm/v3/pkg/kube/fake"
+	"helm.sh/helm/v3/pkg/release"
+	"helm.sh/helm/v3/pkg/storage"
+	"helm.sh/helm/v3/pkg/storage/driver"
 )
 
 func testTimestamper() time.Time { return time.Unix(242085845, 0).UTC() }
diff --git a/cmd/helm/history.go b/cmd/helm/history.go
index ce7ceda69..f978bd977 100644
--- a/cmd/helm/history.go
+++ b/cmd/helm/history.go
@@ -23,11 +23,11 @@ import (
 	"github.com/gosuri/uitable"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/release"
-	"helm.sh/helm/pkg/releaseutil"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/release"
+	"helm.sh/helm/v3/pkg/releaseutil"
 )
 
 var historyHelp = `
diff --git a/cmd/helm/history_test.go b/cmd/helm/history_test.go
index b9d1290d9..3e750cefc 100644
--- a/cmd/helm/history_test.go
+++ b/cmd/helm/history_test.go
@@ -19,7 +19,7 @@ package main
 import (
 	"testing"
 
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 func TestHistoryCmd(t *testing.T) {
diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index 0962f36c6..a5a77cbc2 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -24,14 +24,14 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
-	"helm.sh/helm/pkg/cli/values"
-	"helm.sh/helm/pkg/downloader"
-	"helm.sh/helm/pkg/getter"
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/cli/values"
+	"helm.sh/helm/v3/pkg/downloader"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 const installDesc = `
diff --git a/cmd/helm/lint.go b/cmd/helm/lint.go
index 8b18d3261..13395c6d6 100644
--- a/cmd/helm/lint.go
+++ b/cmd/helm/lint.go
@@ -24,9 +24,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/cli/values"
-	"helm.sh/helm/pkg/getter"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/cli/values"
+	"helm.sh/helm/v3/pkg/getter"
 )
 
 var longLintHelp = `
diff --git a/cmd/helm/list.go b/cmd/helm/list.go
index e7293ded6..57af01e51 100644
--- a/cmd/helm/list.go
+++ b/cmd/helm/list.go
@@ -24,9 +24,9 @@ import (
 	"github.com/gosuri/uitable"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 var listHelp = `
diff --git a/cmd/helm/list_test.go b/cmd/helm/list_test.go
index 886c58176..2de7c5dd2 100644
--- a/cmd/helm/list_test.go
+++ b/cmd/helm/list_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 func TestListCmd(t *testing.T) {
diff --git a/cmd/helm/load_plugins.go b/cmd/helm/load_plugins.go
index b74bc22ea..7bb323195 100644
--- a/cmd/helm/load_plugins.go
+++ b/cmd/helm/load_plugins.go
@@ -27,7 +27,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/pkg/plugin"
+	"helm.sh/helm/v3/pkg/plugin"
 )
 
 type pluginError struct {
diff --git a/cmd/helm/package.go b/cmd/helm/package.go
index 808aabf77..dd4bb2d17 100644
--- a/cmd/helm/package.go
+++ b/cmd/helm/package.go
@@ -25,10 +25,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/cli/values"
-	"helm.sh/helm/pkg/downloader"
-	"helm.sh/helm/pkg/getter"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/cli/values"
+	"helm.sh/helm/v3/pkg/downloader"
+	"helm.sh/helm/v3/pkg/getter"
 )
 
 const packageDesc = `
diff --git a/cmd/helm/package_test.go b/cmd/helm/package_test.go
index e21d3defc..739857fa9 100644
--- a/cmd/helm/package_test.go
+++ b/cmd/helm/package_test.go
@@ -28,10 +28,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
-	"helm.sh/helm/pkg/chartutil"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chartutil"
 )
 
 func TestPackage(t *testing.T) {
diff --git a/cmd/helm/plugin.go b/cmd/helm/plugin.go
index 7c325a84c..5c7b34f09 100644
--- a/cmd/helm/plugin.go
+++ b/cmd/helm/plugin.go
@@ -23,7 +23,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/pkg/plugin"
+	"helm.sh/helm/v3/pkg/plugin"
 )
 
 const pluginHelp = `
diff --git a/cmd/helm/plugin_install.go b/cmd/helm/plugin_install.go
index 94f7396a3..b790943bc 100644
--- a/cmd/helm/plugin_install.go
+++ b/cmd/helm/plugin_install.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/plugin"
-	"helm.sh/helm/pkg/plugin/installer"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/plugin"
+	"helm.sh/helm/v3/pkg/plugin/installer"
 )
 
 type pluginInstallOptions struct {
diff --git a/cmd/helm/plugin_remove.go b/cmd/helm/plugin_remove.go
index a668c7115..b632ab396 100644
--- a/cmd/helm/plugin_remove.go
+++ b/cmd/helm/plugin_remove.go
@@ -24,7 +24,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/pkg/plugin"
+	"helm.sh/helm/v3/pkg/plugin"
 )
 
 type pluginRemoveOptions struct {
diff --git a/cmd/helm/plugin_update.go b/cmd/helm/plugin_update.go
index 4cf2cbf7b..e2f6ad460 100644
--- a/cmd/helm/plugin_update.go
+++ b/cmd/helm/plugin_update.go
@@ -24,8 +24,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/pkg/plugin"
-	"helm.sh/helm/pkg/plugin/installer"
+	"helm.sh/helm/v3/pkg/plugin"
+	"helm.sh/helm/v3/pkg/plugin/installer"
 )
 
 type pluginUpdateOptions struct {
diff --git a/cmd/helm/printer.go b/cmd/helm/printer.go
index 4d47f1c13..f8d1bd2d5 100644
--- a/cmd/helm/printer.go
+++ b/cmd/helm/printer.go
@@ -23,8 +23,8 @@ import (
 
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 var printReleaseTemplate = `REVISION: {{.Release.Version}}
diff --git a/cmd/helm/pull.go b/cmd/helm/pull.go
index 76b4240d4..3b00e9bca 100644
--- a/cmd/helm/pull.go
+++ b/cmd/helm/pull.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const pullDesc = `
diff --git a/cmd/helm/pull_test.go b/cmd/helm/pull_test.go
index 6fb66cbc6..248195774 100644
--- a/cmd/helm/pull_test.go
+++ b/cmd/helm/pull_test.go
@@ -23,7 +23,7 @@ import (
 	"regexp"
 	"testing"
 
-	"helm.sh/helm/pkg/repo/repotest"
+	"helm.sh/helm/v3/pkg/repo/repotest"
 )
 
 func TestPullCmd(t *testing.T) {
diff --git a/cmd/helm/registry.go b/cmd/helm/registry.go
index 2a1e3a03d..479f2ed63 100644
--- a/cmd/helm/registry.go
+++ b/cmd/helm/registry.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const registryHelp = `
diff --git a/cmd/helm/registry_login.go b/cmd/helm/registry_login.go
index c40df0f35..e3435bf9d 100644
--- a/cmd/helm/registry_login.go
+++ b/cmd/helm/registry_login.go
@@ -28,8 +28,8 @@ import (
 	"github.com/docker/docker/pkg/term"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const registryLoginDesc = `
diff --git a/cmd/helm/registry_logout.go b/cmd/helm/registry_logout.go
index 3ec6876b3..e7e1a24fe 100644
--- a/cmd/helm/registry_logout.go
+++ b/cmd/helm/registry_logout.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const registryLogoutDesc = `
diff --git a/cmd/helm/release_testing.go b/cmd/helm/release_testing.go
index ab89c7173..0c5631abd 100644
--- a/cmd/helm/release_testing.go
+++ b/cmd/helm/release_testing.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const releaseTestHelp = `
diff --git a/cmd/helm/release_testing_run.go b/cmd/helm/release_testing_run.go
index d300a65e6..6dc769e83 100644
--- a/cmd/helm/release_testing_run.go
+++ b/cmd/helm/release_testing_run.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const releaseTestRunHelp = `
diff --git a/cmd/helm/repo.go b/cmd/helm/repo.go
index f20bde6c3..8071a8264 100644
--- a/cmd/helm/repo.go
+++ b/cmd/helm/repo.go
@@ -23,7 +23,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
+	"helm.sh/helm/v3/cmd/helm/require"
 )
 
 var repoHelm = `
diff --git a/cmd/helm/repo_add.go b/cmd/helm/repo_add.go
index 1bbffe202..96162499f 100644
--- a/cmd/helm/repo_add.go
+++ b/cmd/helm/repo_add.go
@@ -29,9 +29,9 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/getter"
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 type repoAddOptions struct {
diff --git a/cmd/helm/repo_add_test.go b/cmd/helm/repo_add_test.go
index c0268eef6..c53f3bd65 100644
--- a/cmd/helm/repo_add_test.go
+++ b/cmd/helm/repo_add_test.go
@@ -25,9 +25,9 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/repo"
-	"helm.sh/helm/pkg/repo/repotest"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/repo"
+	"helm.sh/helm/v3/pkg/repo/repotest"
 )
 
 func TestRepoAddCmd(t *testing.T) {
diff --git a/cmd/helm/repo_index.go b/cmd/helm/repo_index.go
index 03cf002e9..63afaf37b 100644
--- a/cmd/helm/repo_index.go
+++ b/cmd/helm/repo_index.go
@@ -24,8 +24,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 const repoIndexDesc = `
diff --git a/cmd/helm/repo_index_test.go b/cmd/helm/repo_index_test.go
index 110b9b892..51c5db80a 100644
--- a/cmd/helm/repo_index_test.go
+++ b/cmd/helm/repo_index_test.go
@@ -23,8 +23,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 func TestRepoIndexCmd(t *testing.T) {
diff --git a/cmd/helm/repo_list.go b/cmd/helm/repo_list.go
index 6136bc022..5abc73c09 100644
--- a/cmd/helm/repo_list.go
+++ b/cmd/helm/repo_list.go
@@ -23,9 +23,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 func newRepoListCmd(out io.Writer) *cobra.Command {
diff --git a/cmd/helm/repo_remove.go b/cmd/helm/repo_remove.go
index 708c713dd..c1ecb1829 100644
--- a/cmd/helm/repo_remove.go
+++ b/cmd/helm/repo_remove.go
@@ -25,9 +25,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/helmpath"
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 type repoRemoveOptions struct {
diff --git a/cmd/helm/repo_remove_test.go b/cmd/helm/repo_remove_test.go
index 5e8ddd209..3fdcbe9c3 100644
--- a/cmd/helm/repo_remove_test.go
+++ b/cmd/helm/repo_remove_test.go
@@ -23,10 +23,10 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/helmpath"
-	"helm.sh/helm/pkg/repo"
-	"helm.sh/helm/pkg/repo/repotest"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/repo"
+	"helm.sh/helm/v3/pkg/repo/repotest"
 )
 
 func TestRepoRemove(t *testing.T) {
diff --git a/cmd/helm/repo_update.go b/cmd/helm/repo_update.go
index ba9a3ea09..027f18518 100644
--- a/cmd/helm/repo_update.go
+++ b/cmd/helm/repo_update.go
@@ -24,9 +24,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/getter"
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 const updateDesc = `
diff --git a/cmd/helm/repo_update_test.go b/cmd/helm/repo_update_test.go
index da147a15c..6ddce0637 100644
--- a/cmd/helm/repo_update_test.go
+++ b/cmd/helm/repo_update_test.go
@@ -22,10 +22,10 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/getter"
-	"helm.sh/helm/pkg/repo"
-	"helm.sh/helm/pkg/repo/repotest"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/repo"
+	"helm.sh/helm/v3/pkg/repo/repotest"
 )
 
 func TestUpdateCmd(t *testing.T) {
diff --git a/cmd/helm/rollback.go b/cmd/helm/rollback.go
index 140c5b62f..d44ef14f4 100644
--- a/cmd/helm/rollback.go
+++ b/cmd/helm/rollback.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const rollbackDesc = `
diff --git a/cmd/helm/rollback_test.go b/cmd/helm/rollback_test.go
index de0f9b0f1..fdc627b5f 100644
--- a/cmd/helm/rollback_test.go
+++ b/cmd/helm/rollback_test.go
@@ -19,8 +19,8 @@ package main
 import (
 	"testing"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 func TestRollbackCmd(t *testing.T) {
diff --git a/cmd/helm/root.go b/cmd/helm/root.go
index b7b9cbe3b..eccb49fa0 100644
--- a/cmd/helm/root.go
+++ b/cmd/helm/root.go
@@ -14,16 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main // import "helm.sh/helm/cmd/helm"
+package main // import "helm.sh/helm/v3/cmd/helm"
 
 import (
 	"io"
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/internal/experimental/registry"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/internal/experimental/registry"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const (
diff --git a/cmd/helm/root_test.go b/cmd/helm/root_test.go
index 95802cf5d..7d606b8a9 100644
--- a/cmd/helm/root_test.go
+++ b/cmd/helm/root_test.go
@@ -21,9 +21,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/helmpath"
-	"helm.sh/helm/pkg/helmpath/xdg"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/helmpath/xdg"
 )
 
 func TestRootCmd(t *testing.T) {
diff --git a/cmd/helm/search/search.go b/cmd/helm/search/search.go
index 43d62949a..855da4a3d 100644
--- a/cmd/helm/search/search.go
+++ b/cmd/helm/search/search.go
@@ -30,7 +30,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 // Result is a search result.
diff --git a/cmd/helm/search/search_test.go b/cmd/helm/search/search_test.go
index 47c0a0e9f..9c1859d77 100644
--- a/cmd/helm/search/search_test.go
+++ b/cmd/helm/search/search_test.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 func TestSortScore(t *testing.T) {
diff --git a/cmd/helm/search_hub.go b/cmd/helm/search_hub.go
index 3775c79bd..bf2a3aeab 100644
--- a/cmd/helm/search_hub.go
+++ b/cmd/helm/search_hub.go
@@ -25,8 +25,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/internal/monocular"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/internal/monocular"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const searchHubDesc = `
diff --git a/cmd/helm/search_repo.go b/cmd/helm/search_repo.go
index 8f926bcd5..a30629420 100644
--- a/cmd/helm/search_repo.go
+++ b/cmd/helm/search_repo.go
@@ -27,10 +27,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/search"
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/helmpath"
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/cmd/helm/search"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 const searchRepoDesc = `
diff --git a/cmd/helm/show.go b/cmd/helm/show.go
index 68260eddd..4c2d42815 100644
--- a/cmd/helm/show.go
+++ b/cmd/helm/show.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const showDesc = `
diff --git a/cmd/helm/status.go b/cmd/helm/status.go
index f97e0d475..af08d92ab 100644
--- a/cmd/helm/status.go
+++ b/cmd/helm/status.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 var statusHelp = `
diff --git a/cmd/helm/status_test.go b/cmd/helm/status_test.go
index f277269dd..198063220 100644
--- a/cmd/helm/status_test.go
+++ b/cmd/helm/status_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 func TestStatusCmd(t *testing.T) {
diff --git a/cmd/helm/template.go b/cmd/helm/template.go
index c1af7ff23..4556112a1 100644
--- a/cmd/helm/template.go
+++ b/cmd/helm/template.go
@@ -23,9 +23,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/cli/values"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/cli/values"
 )
 
 const templateDesc = `
diff --git a/cmd/helm/uninstall.go b/cmd/helm/uninstall.go
index 0710a3c45..27b5a8426 100644
--- a/cmd/helm/uninstall.go
+++ b/cmd/helm/uninstall.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const uninstallDesc = `
diff --git a/cmd/helm/uninstall_test.go b/cmd/helm/uninstall_test.go
index 2681dc447..a34934077 100644
--- a/cmd/helm/uninstall_test.go
+++ b/cmd/helm/uninstall_test.go
@@ -19,7 +19,7 @@ package main
 import (
 	"testing"
 
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 func TestUninstall(t *testing.T) {
diff --git a/cmd/helm/upgrade.go b/cmd/helm/upgrade.go
index 29b463c5b..5c107d2df 100644
--- a/cmd/helm/upgrade.go
+++ b/cmd/helm/upgrade.go
@@ -24,12 +24,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
-	"helm.sh/helm/pkg/chart/loader"
-	"helm.sh/helm/pkg/cli/values"
-	"helm.sh/helm/pkg/getter"
-	"helm.sh/helm/pkg/storage/driver"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/cli/values"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/storage/driver"
 )
 
 const upgradeDesc = `
diff --git a/cmd/helm/upgrade_test.go b/cmd/helm/upgrade_test.go
index 0d544011e..bd1ccec35 100644
--- a/cmd/helm/upgrade_test.go
+++ b/cmd/helm/upgrade_test.go
@@ -23,11 +23,11 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 func TestUpgradeCmd(t *testing.T) {
diff --git a/cmd/helm/verify.go b/cmd/helm/verify.go
index a44f46238..1cdd26290 100644
--- a/cmd/helm/verify.go
+++ b/cmd/helm/verify.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/pkg/action"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/pkg/action"
 )
 
 const verifyDesc = `
diff --git a/cmd/helm/version.go b/cmd/helm/version.go
index 888dc6094..8c0c11484 100644
--- a/cmd/helm/version.go
+++ b/cmd/helm/version.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/cmd/helm/require"
-	"helm.sh/helm/internal/version"
+	"helm.sh/helm/v3/cmd/helm/require"
+	"helm.sh/helm/v3/internal/version"
 )
 
 const versionDesc = `
diff --git a/go.mod b/go.mod
index 82b4e0626..42c0fa088 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module helm.sh/helm
+module helm.sh/helm/v3
 
 go 1.13
 
@@ -10,7 +10,9 @@ require (
 	github.com/BurntSushi/toml v0.3.1
 	github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e
 	github.com/Masterminds/goutils v1.1.0
+	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/semver/v3 v3.0.1
+	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
 	github.com/Masterminds/sprig/v3 v3.0.0
 	github.com/Masterminds/vcs v1.13.0
 	github.com/Microsoft/go-winio v0.4.12
@@ -71,9 +73,11 @@ require (
 	github.com/huandu/xstrings v1.2.0
 	github.com/imdario/mergo v0.3.7
 	github.com/inconshreveable/mousetrap v1.0.0
+	github.com/jmoiron/sqlx v1.2.0 // indirect
 	github.com/json-iterator/go v1.1.7
 	github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1
 	github.com/konsorten/go-windows-terminal-sequences v1.0.1
+	github.com/lib/pq v1.2.0 // indirect
 	github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63
 	github.com/mattn/go-runewidth v0.0.4
 	github.com/mattn/go-shellwords v1.0.5
@@ -93,6 +97,7 @@ require (
 	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
 	github.com/prometheus/common v0.2.0
 	github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5
+	github.com/rubenv/sql-migrate v0.0.0-20190902133344-8926f37f0bc1 // indirect
 	github.com/russross/blackfriday v1.5.2
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.5
@@ -118,6 +123,7 @@ require (
 	google.golang.org/appengine v1.5.0
 	google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873
 	google.golang.org/grpc v1.23.0
+	gopkg.in/gorp.v1 v1.7.2 // indirect
 	gopkg.in/yaml.v2 v2.2.2
 	k8s.io/api v0.0.0
 	k8s.io/apiextensions-apiserver v0.0.0
diff --git a/go.sum b/go.sum
index 04aa1cf10..222f641f9 100644
--- a/go.sum
+++ b/go.sum
@@ -96,6 +96,7 @@ github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH
 github.com/census-instrumentation/opencensus-proto v0.0.2-0.20180913191712-f303ae3f8d6a/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.1.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY=
+github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8=
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod h1:TrMrLQfeENAPYPRsJuq3jsqdlRh3lvi6trTZJG8+tho=
 github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
@@ -127,6 +128,7 @@ github.com/coreos/rkt v1.30.0/go.mod h1:O634mlH6U7qk87poQifK6M2rsFNt+FyUTWNMnP1h
 github.com/cpuguy83/go-md2man v1.0.8/go.mod h1:N6JayAiVKtlHSnuTCeuLSQVs75hb8q+dYQLjr7cDsKY=
 github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -235,6 +237,7 @@ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh
 github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
 github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=
+github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
@@ -326,6 +329,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA=
+github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -352,7 +357,11 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
+github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=
+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
 github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
 github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA=
@@ -375,6 +384,7 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp
 github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-shellwords v1.0.5 h1:JhhFTIOslh5ZsPrpa3Wdg8bF0WI3b44EMblmU9wIsXc=
 github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
+github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4=
@@ -465,6 +475,8 @@ github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
 github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rubenv/sql-migrate v0.0.0-20190902133344-8926f37f0bc1 h1:G7j/gxkXAL80NMLOWi6EEctDET1Iuxl3sBMJXDnu2z0=
+github.com/rubenv/sql-migrate v0.0.0-20190902133344-8926f37f0bc1/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY=
 github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto=
 github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
@@ -671,6 +683,8 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
+gopkg.in/gorp.v1 v1.7.2 h1:j3DWlAyGVv8whO7AcIWznQ2Yj7yJkn34B8s63GViAAw=
+gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw=
 gopkg.in/inf.v0 v0.9.0 h1:3zYtXIO92bvsdS3ggAdA8Gb4Azj0YU+TVY1uGYNFA8o=
 gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U=
@@ -687,6 +701,8 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpAriY=
+helm.sh/helm v2.14.3+incompatible h1:M3xvix8x41Xjc/ZGARGpUOTjxTBrb86yZG5FmCjgIew=
+helm.sh/helm v2.14.3+incompatible/go.mod h1:0Xbc6ErzwWH9qC55X1+hE3ZwhM3atbhCm/NbFZw5i+4=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -696,6 +712,8 @@ honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
+k8s.io/helm v2.14.3+incompatible h1:uzotTcZXa/b2SWVoUzM1xiCXVjI38TuxMujS/1s+3Gw=
+k8s.io/helm v2.14.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
@@ -780,4 +798,5 @@ sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:w
 sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
+vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc h1:MksmcCZQWAQJCTA5T0jgI/0sJ51AVm4Z41MrmfczEoc=
 vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=
diff --git a/internal/experimental/registry/authorizer.go b/internal/experimental/registry/authorizer.go
index 783404f6f..918a999ba 100644
--- a/internal/experimental/registry/authorizer.go
+++ b/internal/experimental/registry/authorizer.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package registry // import "helm.sh/helm/internal/experimental/registry"
+package registry // import "helm.sh/helm/v3/internal/experimental/registry"
 
 import (
 	"github.com/deislabs/oras/pkg/auth"
diff --git a/internal/experimental/registry/cache.go b/internal/experimental/registry/cache.go
index 107affcce..19ceb86ea 100644
--- a/internal/experimental/registry/cache.go
+++ b/internal/experimental/registry/cache.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package registry // import "helm.sh/helm/internal/experimental/registry"
+package registry // import "helm.sh/helm/v3/internal/experimental/registry"
 
 import (
 	"bytes"
@@ -34,9 +34,9 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
-	"helm.sh/helm/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chartutil"
 )
 
 const (
diff --git a/internal/experimental/registry/cache_opts.go b/internal/experimental/registry/cache_opts.go
index 51225e7db..6851ae807 100644
--- a/internal/experimental/registry/cache_opts.go
+++ b/internal/experimental/registry/cache_opts.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package registry // import "helm.sh/helm/internal/experimental/registry"
+package registry // import "helm.sh/helm/v3/internal/experimental/registry"
 
 import (
 	"io"
diff --git a/internal/experimental/registry/client.go b/internal/experimental/registry/client.go
index 8ec5ccd7b..d52d9f3e0 100644
--- a/internal/experimental/registry/client.go
+++ b/internal/experimental/registry/client.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package registry // import "helm.sh/helm/internal/experimental/registry"
+package registry // import "helm.sh/helm/v3/internal/experimental/registry"
 
 import (
 	"context"
@@ -29,8 +29,8 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/helmpath"
 )
 
 const (
diff --git a/internal/experimental/registry/client_opts.go b/internal/experimental/registry/client_opts.go
index 0eaa84346..cd295813a 100644
--- a/internal/experimental/registry/client_opts.go
+++ b/internal/experimental/registry/client_opts.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package registry // import "helm.sh/helm/internal/experimental/registry"
+package registry // import "helm.sh/helm/v3/internal/experimental/registry"
 
 import (
 	"io"
diff --git a/internal/experimental/registry/client_test.go b/internal/experimental/registry/client_test.go
index d2cc1abaa..0861c8984 100644
--- a/internal/experimental/registry/client_test.go
+++ b/internal/experimental/registry/client_test.go
@@ -36,7 +36,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	"golang.org/x/crypto/bcrypt"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 var (
diff --git a/internal/experimental/registry/constants.go b/internal/experimental/registry/constants.go
index 2f1025efe..e0f17fe61 100644
--- a/internal/experimental/registry/constants.go
+++ b/internal/experimental/registry/constants.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package registry // import "helm.sh/helm/internal/experimental/registry"
+package registry // import "helm.sh/helm/v3/internal/experimental/registry"
 
 const (
 	// HelmChartConfigMediaType is the reserved media type for the Helm chart manifest config
diff --git a/internal/experimental/registry/reference.go b/internal/experimental/registry/reference.go
index 4b394d7a5..ced6cf33a 100644
--- a/internal/experimental/registry/reference.go
+++ b/internal/experimental/registry/reference.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package registry // import "helm.sh/helm/internal/experimental/registry"
+package registry // import "helm.sh/helm/v3/internal/experimental/registry"
 
 import (
 	"errors"
diff --git a/internal/experimental/registry/resolver.go b/internal/experimental/registry/resolver.go
index 716c01f89..ff8a82633 100644
--- a/internal/experimental/registry/resolver.go
+++ b/internal/experimental/registry/resolver.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package registry // import "helm.sh/helm/internal/experimental/registry"
+package registry // import "helm.sh/helm/v3/internal/experimental/registry"
 
 import (
 	"github.com/containerd/containerd/remotes"
diff --git a/internal/experimental/registry/util.go b/internal/experimental/registry/util.go
index 3af6318e0..3a4589d01 100644
--- a/internal/experimental/registry/util.go
+++ b/internal/experimental/registry/util.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package registry // import "helm.sh/helm/internal/experimental/registry"
+package registry // import "helm.sh/helm/v3/internal/experimental/registry"
 
 import (
 	"context"
diff --git a/internal/ignore/doc.go b/internal/ignore/doc.go
index 112f77e7b..e6a6a6c7b 100644
--- a/internal/ignore/doc.go
+++ b/internal/ignore/doc.go
@@ -64,4 +64,4 @@ Notable differences from .gitignore:
 	- The evaluation of escape sequences has not been tested for compatibility
 	- There is no support for '\!' as a special leading sequence.
 */
-package ignore // import "helm.sh/helm/internal/ignore"
+package ignore // import "helm.sh/helm/v3/internal/ignore"
diff --git a/internal/monocular/search.go b/internal/monocular/search.go
index feadf93df..61695f554 100644
--- a/internal/monocular/search.go
+++ b/internal/monocular/search.go
@@ -24,8 +24,8 @@ import (
 	"path"
 	"time"
 
-	"helm.sh/helm/internal/version"
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/internal/version"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 // SearchPath is the url path to the search API in monocular.
diff --git a/internal/resolver/resolver.go b/internal/resolver/resolver.go
index 7f9beeaf3..c902b0134 100644
--- a/internal/resolver/resolver.go
+++ b/internal/resolver/resolver.go
@@ -26,10 +26,10 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/helmpath"
-	"helm.sh/helm/pkg/provenance"
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/provenance"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 // Resolver resolves dependencies from semantic version ranges to a particular version.
diff --git a/internal/resolver/resolver_test.go b/internal/resolver/resolver_test.go
index 38fa2a099..3c402aaea 100644
--- a/internal/resolver/resolver_test.go
+++ b/internal/resolver/resolver_test.go
@@ -18,7 +18,7 @@ package resolver
 import (
 	"testing"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 func TestResolve(t *testing.T) {
diff --git a/internal/test/ensure/ensure.go b/internal/test/ensure/ensure.go
index ded2f1cca..b4775df80 100644
--- a/internal/test/ensure/ensure.go
+++ b/internal/test/ensure/ensure.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"helm.sh/helm/pkg/helmpath/xdg"
+	"helm.sh/helm/v3/pkg/helmpath/xdg"
 )
 
 // HelmHome sets up a Helm Home in a temp dir.
diff --git a/internal/version/version.go b/internal/version/version.go
index 394476039..131a2b130 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package version // import "helm.sh/helm/internal/version"
+package version // import "helm.sh/helm/v3/internal/version"
 
 import (
 	"flag"
diff --git a/pkg/action/action.go b/pkg/action/action.go
index f5ba24ba7..f784b3651 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -27,11 +27,11 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 
-	"helm.sh/helm/internal/experimental/registry"
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/kube"
-	"helm.sh/helm/pkg/release"
-	"helm.sh/helm/pkg/storage"
+	"helm.sh/helm/v3/internal/experimental/registry"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/kube"
+	"helm.sh/helm/v3/pkg/release"
+	"helm.sh/helm/v3/pkg/storage"
 )
 
 // Timestamper is a function capable of producing a timestamp.Timestamper.
diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go
index 716132853..ab6358e94 100644
--- a/pkg/action/action_test.go
+++ b/pkg/action/action_test.go
@@ -26,13 +26,13 @@ import (
 	dockerauth "github.com/deislabs/oras/pkg/auth/docker"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 
-	"helm.sh/helm/internal/experimental/registry"
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chartutil"
-	kubefake "helm.sh/helm/pkg/kube/fake"
-	"helm.sh/helm/pkg/release"
-	"helm.sh/helm/pkg/storage"
-	"helm.sh/helm/pkg/storage/driver"
+	"helm.sh/helm/v3/internal/experimental/registry"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chartutil"
+	kubefake "helm.sh/helm/v3/pkg/kube/fake"
+	"helm.sh/helm/v3/pkg/release"
+	"helm.sh/helm/v3/pkg/storage"
+	"helm.sh/helm/v3/pkg/storage/driver"
 )
 
 var verbose = flag.Bool("test.log", false, "enable test logging")
diff --git a/pkg/action/chart_export.go b/pkg/action/chart_export.go
index 6d2570066..75840d8bc 100644
--- a/pkg/action/chart_export.go
+++ b/pkg/action/chart_export.go
@@ -21,8 +21,8 @@ import (
 	"io"
 	"path/filepath"
 
-	"helm.sh/helm/internal/experimental/registry"
-	"helm.sh/helm/pkg/chartutil"
+	"helm.sh/helm/v3/internal/experimental/registry"
+	"helm.sh/helm/v3/pkg/chartutil"
 )
 
 // ChartExport performs a chart export operation.
diff --git a/pkg/action/chart_pull.go b/pkg/action/chart_pull.go
index 7fb7d6011..97abde7cc 100644
--- a/pkg/action/chart_pull.go
+++ b/pkg/action/chart_pull.go
@@ -19,7 +19,7 @@ package action
 import (
 	"io"
 
-	"helm.sh/helm/internal/experimental/registry"
+	"helm.sh/helm/v3/internal/experimental/registry"
 )
 
 // ChartPull performs a chart pull operation.
diff --git a/pkg/action/chart_push.go b/pkg/action/chart_push.go
index 2c867e644..91ec49d38 100644
--- a/pkg/action/chart_push.go
+++ b/pkg/action/chart_push.go
@@ -19,7 +19,7 @@ package action
 import (
 	"io"
 
-	"helm.sh/helm/internal/experimental/registry"
+	"helm.sh/helm/v3/internal/experimental/registry"
 )
 
 // ChartPush performs a chart push operation.
diff --git a/pkg/action/chart_remove.go b/pkg/action/chart_remove.go
index c810a395f..3c0fc2ed7 100644
--- a/pkg/action/chart_remove.go
+++ b/pkg/action/chart_remove.go
@@ -19,7 +19,7 @@ package action
 import (
 	"io"
 
-	"helm.sh/helm/internal/experimental/registry"
+	"helm.sh/helm/v3/internal/experimental/registry"
 )
 
 // ChartRemove performs a chart remove operation.
diff --git a/pkg/action/chart_save.go b/pkg/action/chart_save.go
index cd1bfccb2..14a2d7c3c 100644
--- a/pkg/action/chart_save.go
+++ b/pkg/action/chart_save.go
@@ -19,8 +19,8 @@ package action
 import (
 	"io"
 
-	"helm.sh/helm/internal/experimental/registry"
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/internal/experimental/registry"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 // ChartSave performs a chart save operation.
diff --git a/pkg/action/chart_save_test.go b/pkg/action/chart_save_test.go
index 999130b16..4fd991a4e 100644
--- a/pkg/action/chart_save_test.go
+++ b/pkg/action/chart_save_test.go
@@ -20,7 +20,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"helm.sh/helm/internal/experimental/registry"
+	"helm.sh/helm/v3/internal/experimental/registry"
 )
 
 func chartSaveAction(t *testing.T) *ChartSave {
diff --git a/pkg/action/dependency.go b/pkg/action/dependency.go
index 84c6d9590..5781cc913 100644
--- a/pkg/action/dependency.go
+++ b/pkg/action/dependency.go
@@ -25,8 +25,8 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/gosuri/uitable"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
 )
 
 // Dependency is the action for building a given chart's dependency tree.
diff --git a/pkg/action/get.go b/pkg/action/get.go
index 0690ce0db..c776eb696 100644
--- a/pkg/action/get.go
+++ b/pkg/action/get.go
@@ -17,7 +17,7 @@ limitations under the License.
 package action
 
 import (
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 // Get is the action for checking a given release's information.
diff --git a/pkg/action/get_values.go b/pkg/action/get_values.go
index 2ba6f54cd..e5f4f4f04 100644
--- a/pkg/action/get_values.go
+++ b/pkg/action/get_values.go
@@ -19,7 +19,7 @@ package action
 import (
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/chartutil"
 )
 
 // GetValues is the action for checking a given release's values.
diff --git a/pkg/action/history.go b/pkg/action/history.go
index b2933585e..350876a9d 100644
--- a/pkg/action/history.go
+++ b/pkg/action/history.go
@@ -19,7 +19,7 @@ package action
 import (
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 // History is the action for checking the release's ledger.
diff --git a/pkg/action/hooks.go b/pkg/action/hooks.go
index 59e9c97ab..a8a27a5a2 100644
--- a/pkg/action/hooks.go
+++ b/pkg/action/hooks.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 // execHook executes all of the hooks for the given hook event.
diff --git a/pkg/action/install.go b/pkg/action/install.go
index 34ed4e322..0badcdb58 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -32,18 +32,18 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/cli-runtime/pkg/resource"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/cli"
-	"helm.sh/helm/pkg/downloader"
-	"helm.sh/helm/pkg/engine"
-	"helm.sh/helm/pkg/getter"
-	kubefake "helm.sh/helm/pkg/kube/fake"
-	"helm.sh/helm/pkg/release"
-	"helm.sh/helm/pkg/releaseutil"
-	"helm.sh/helm/pkg/repo"
-	"helm.sh/helm/pkg/storage"
-	"helm.sh/helm/pkg/storage/driver"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/cli"
+	"helm.sh/helm/v3/pkg/downloader"
+	"helm.sh/helm/v3/pkg/engine"
+	"helm.sh/helm/v3/pkg/getter"
+	kubefake "helm.sh/helm/v3/pkg/kube/fake"
+	"helm.sh/helm/v3/pkg/release"
+	"helm.sh/helm/v3/pkg/releaseutil"
+	"helm.sh/helm/v3/pkg/repo"
+	"helm.sh/helm/v3/pkg/storage"
+	"helm.sh/helm/v3/pkg/storage/driver"
 )
 
 // releaseNameMaxLen is the maximum length of a release name.
diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go
index 48551d962..de03a5a71 100644
--- a/pkg/action/install_test.go
+++ b/pkg/action/install_test.go
@@ -28,11 +28,11 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"helm.sh/helm/internal/test"
-	"helm.sh/helm/pkg/chartutil"
-	kubefake "helm.sh/helm/pkg/kube/fake"
-	"helm.sh/helm/pkg/release"
-	"helm.sh/helm/pkg/storage/driver"
+	"helm.sh/helm/v3/internal/test"
+	"helm.sh/helm/v3/pkg/chartutil"
+	kubefake "helm.sh/helm/v3/pkg/kube/fake"
+	"helm.sh/helm/v3/pkg/release"
+	"helm.sh/helm/v3/pkg/storage/driver"
 )
 
 type nameTemplateTestCase struct {
diff --git a/pkg/action/lint.go b/pkg/action/lint.go
index c5a77eb4e..84a139686 100644
--- a/pkg/action/lint.go
+++ b/pkg/action/lint.go
@@ -24,9 +24,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/lint"
-	"helm.sh/helm/pkg/lint/support"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/lint"
+	"helm.sh/helm/v3/pkg/lint/support"
 )
 
 var errLintNoChart = errors.New("no chart found for linting (missing Chart.yaml)")
diff --git a/pkg/action/list.go b/pkg/action/list.go
index 6022a24cd..6fb36ef40 100644
--- a/pkg/action/list.go
+++ b/pkg/action/list.go
@@ -19,8 +19,8 @@ package action
 import (
 	"regexp"
 
-	"helm.sh/helm/pkg/release"
-	"helm.sh/helm/pkg/releaseutil"
+	"helm.sh/helm/v3/pkg/release"
+	"helm.sh/helm/v3/pkg/releaseutil"
 )
 
 // ListStates represents zero or more status codes that a list item may have set
diff --git a/pkg/action/list_test.go b/pkg/action/list_test.go
index 48e9a376a..cab0111fd 100644
--- a/pkg/action/list_test.go
+++ b/pkg/action/list_test.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"helm.sh/helm/pkg/release"
-	"helm.sh/helm/pkg/storage"
+	"helm.sh/helm/v3/pkg/release"
+	"helm.sh/helm/v3/pkg/storage"
 )
 
 func TestListStates(t *testing.T) {
diff --git a/pkg/action/package.go b/pkg/action/package.go
index a80239f46..5c85ebe0d 100644
--- a/pkg/action/package.go
+++ b/pkg/action/package.go
@@ -26,10 +26,10 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/ssh/terminal"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/provenance"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/provenance"
 )
 
 // Package is the action for packaging a chart.
diff --git a/pkg/action/package_test.go b/pkg/action/package_test.go
index c526d7055..0f716118d 100644
--- a/pkg/action/package_test.go
+++ b/pkg/action/package_test.go
@@ -19,7 +19,7 @@ package action
 import (
 	"testing"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 func TestSetVersion(t *testing.T) {
diff --git a/pkg/action/printer.go b/pkg/action/printer.go
index 704ea523d..7133e4d1b 100644
--- a/pkg/action/printer.go
+++ b/pkg/action/printer.go
@@ -21,7 +21,7 @@ import (
 	"io"
 	"strings"
 
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 // PrintRelease prints info about a release
diff --git a/pkg/action/pull.go b/pkg/action/pull.go
index 8a1dc535e..aaf63861e 100644
--- a/pkg/action/pull.go
+++ b/pkg/action/pull.go
@@ -25,11 +25,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/cli"
-	"helm.sh/helm/pkg/downloader"
-	"helm.sh/helm/pkg/getter"
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/cli"
+	"helm.sh/helm/v3/pkg/downloader"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 // Pull is the action for checking a given release's information.
diff --git a/pkg/action/release_testing.go b/pkg/action/release_testing.go
index 1a6e5b8ba..40dddf061 100644
--- a/pkg/action/release_testing.go
+++ b/pkg/action/release_testing.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 // ReleaseTesting is the action for testing a release.
diff --git a/pkg/action/resource_policy.go b/pkg/action/resource_policy.go
index 5a0244bcd..cfabdf7ba 100644
--- a/pkg/action/resource_policy.go
+++ b/pkg/action/resource_policy.go
@@ -19,7 +19,7 @@ package action
 import (
 	"strings"
 
-	"helm.sh/helm/pkg/releaseutil"
+	"helm.sh/helm/v3/pkg/releaseutil"
 )
 
 // resourcePolicyAnno is the annotation name for a resource policy
diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go
index fa3f9d4fc..3d1ecb295 100644
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 // Rollback is the action for rolling back to a given release.
diff --git a/pkg/action/show.go b/pkg/action/show.go
index 7221e93ab..3733b28fd 100644
--- a/pkg/action/show.go
+++ b/pkg/action/show.go
@@ -22,8 +22,8 @@ import (
 
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
 )
 
 type ShowOutputFormat string
diff --git a/pkg/action/status.go b/pkg/action/status.go
index dea9c0351..5e873ddd8 100644
--- a/pkg/action/status.go
+++ b/pkg/action/status.go
@@ -17,7 +17,7 @@ limitations under the License.
 package action
 
 import (
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 // Status is the action for checking the deployment status of releases.
diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go
index 4d42403bd..22123ad82 100644
--- a/pkg/action/uninstall.go
+++ b/pkg/action/uninstall.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/release"
-	"helm.sh/helm/pkg/releaseutil"
+	"helm.sh/helm/v3/pkg/release"
+	"helm.sh/helm/v3/pkg/releaseutil"
 )
 
 // Uninstall is the action for uninstalling releases.
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index 3d53ff99e..bce561cfc 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -26,11 +26,11 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/cli-runtime/pkg/resource"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/kube"
-	"helm.sh/helm/pkg/release"
-	"helm.sh/helm/pkg/releaseutil"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/kube"
+	"helm.sh/helm/v3/pkg/release"
+	"helm.sh/helm/v3/pkg/releaseutil"
 )
 
 // Upgrade is the action for upgrading releases.
diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go
index 81004e907..f2d2224e6 100644
--- a/pkg/action/upgrade_test.go
+++ b/pkg/action/upgrade_test.go
@@ -23,8 +23,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	kubefake "helm.sh/helm/pkg/kube/fake"
-	"helm.sh/helm/pkg/release"
+	kubefake "helm.sh/helm/v3/pkg/kube/fake"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 func upgradeAction(t *testing.T) *Upgrade {
diff --git a/pkg/action/validate.go b/pkg/action/validate.go
index 56b0acdeb..526a4c7fc 100644
--- a/pkg/action/validate.go
+++ b/pkg/action/validate.go
@@ -23,7 +23,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/cli-runtime/pkg/resource"
 
-	"helm.sh/helm/pkg/kube"
+	"helm.sh/helm/v3/pkg/kube"
 )
 
 func existingResourceConflict(resources kube.ResourceList) error {
diff --git a/pkg/action/verify.go b/pkg/action/verify.go
index e78d50a14..c66b14b47 100644
--- a/pkg/action/verify.go
+++ b/pkg/action/verify.go
@@ -17,7 +17,7 @@ limitations under the License.
 package action
 
 import (
-	"helm.sh/helm/pkg/downloader"
+	"helm.sh/helm/v3/pkg/downloader"
 )
 
 // Verify is the action for building a given chart's Verify tree.
diff --git a/pkg/chart/loader/archive.go b/pkg/chart/loader/archive.go
index a8dc3f17b..1418f7bd9 100644
--- a/pkg/chart/loader/archive.go
+++ b/pkg/chart/loader/archive.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 // FileLoader loads a chart from a file
diff --git a/pkg/chart/loader/directory.go b/pkg/chart/loader/directory.go
index ddfc0d4c9..bfb632405 100644
--- a/pkg/chart/loader/directory.go
+++ b/pkg/chart/loader/directory.go
@@ -24,9 +24,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/internal/ignore"
-	"helm.sh/helm/internal/sympath"
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/internal/ignore"
+	"helm.sh/helm/v3/internal/sympath"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 // DirLoader loads a chart from a directory
diff --git a/pkg/chart/loader/load.go b/pkg/chart/loader/load.go
index ca9eadb32..04105f9ac 100644
--- a/pkg/chart/loader/load.go
+++ b/pkg/chart/loader/load.go
@@ -26,7 +26,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 // ChartLoader loads a chart.
diff --git a/pkg/chart/loader/load_test.go b/pkg/chart/loader/load_test.go
index 0503d4edd..59f49349a 100644
--- a/pkg/chart/loader/load_test.go
+++ b/pkg/chart/loader/load_test.go
@@ -20,7 +20,7 @@ import (
 	"bytes"
 	"testing"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 func TestLoadDir(t *testing.T) {
diff --git a/pkg/chartutil/chartfile.go b/pkg/chartutil/chartfile.go
index 802960d07..68176ed5d 100644
--- a/pkg/chartutil/chartfile.go
+++ b/pkg/chartutil/chartfile.go
@@ -24,7 +24,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 // LoadChartfile loads a Chart.yaml file into a *chart.Metadata.
diff --git a/pkg/chartutil/chartfile_test.go b/pkg/chartutil/chartfile_test.go
index 33d149501..9a6e608f6 100644
--- a/pkg/chartutil/chartfile_test.go
+++ b/pkg/chartutil/chartfile_test.go
@@ -19,7 +19,7 @@ package chartutil
 import (
 	"testing"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 const testfile = "testdata/chartfiletest.yaml"
diff --git a/pkg/chartutil/coalesce.go b/pkg/chartutil/coalesce.go
index ea05e0b5b..f18d520a4 100644
--- a/pkg/chartutil/coalesce.go
+++ b/pkg/chartutil/coalesce.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 // CoalesceValues coalesces all of the values in a chart (and its subcharts).
diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index b7f3b1c56..023e3bb9a 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -26,8 +26,8 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
 )
 
 const (
diff --git a/pkg/chartutil/create_test.go b/pkg/chartutil/create_test.go
index d6e6a498f..87205cab0 100644
--- a/pkg/chartutil/create_test.go
+++ b/pkg/chartutil/create_test.go
@@ -22,8 +22,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
 )
 
 func TestCreate(t *testing.T) {
diff --git a/pkg/chartutil/dependencies.go b/pkg/chartutil/dependencies.go
index f52b61313..4b389dc22 100644
--- a/pkg/chartutil/dependencies.go
+++ b/pkg/chartutil/dependencies.go
@@ -19,7 +19,7 @@ import (
 	"log"
 	"strings"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 // ProcessDependencies checks through this chart's dependencies, processing accordingly.
diff --git a/pkg/chartutil/dependencies_test.go b/pkg/chartutil/dependencies_test.go
index 679db2989..ecd632540 100644
--- a/pkg/chartutil/dependencies_test.go
+++ b/pkg/chartutil/dependencies_test.go
@@ -21,8 +21,8 @@ import (
 	"strconv"
 	"testing"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
 )
 
 func loadChart(t *testing.T, path string) *chart.Chart {
diff --git a/pkg/chartutil/doc.go b/pkg/chartutil/doc.go
index db90c12fe..5dd9c7038 100644
--- a/pkg/chartutil/doc.go
+++ b/pkg/chartutil/doc.go
@@ -41,4 +41,4 @@ into a Chart.
 When creating charts in memory, use the 'helm.sh/helm/pkg/proto/chart'
 package directly.
 */
-package chartutil // import "helm.sh/helm/pkg/chartutil"
+package chartutil // import "helm.sh/helm/v3/pkg/chartutil"
diff --git a/pkg/chartutil/jsonschema.go b/pkg/chartutil/jsonschema.go
index fe1aced7c..0848faaf2 100644
--- a/pkg/chartutil/jsonschema.go
+++ b/pkg/chartutil/jsonschema.go
@@ -25,7 +25,7 @@ import (
 	"github.com/xeipuuv/gojsonschema"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 // ValidateAgainstSchema checks that values does not violate the structure laid out in schema
diff --git a/pkg/chartutil/jsonschema_test.go b/pkg/chartutil/jsonschema_test.go
index 2a8f48102..2677ee0ea 100644
--- a/pkg/chartutil/jsonschema_test.go
+++ b/pkg/chartutil/jsonschema_test.go
@@ -20,7 +20,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 func TestValidateAgainstSingleSchema(t *testing.T) {
diff --git a/pkg/chartutil/save.go b/pkg/chartutil/save.go
index 83d95cc5a..8cf4991e0 100644
--- a/pkg/chartutil/save.go
+++ b/pkg/chartutil/save.go
@@ -26,7 +26,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 var headerBytes = []byte("+aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=")
diff --git a/pkg/chartutil/save_test.go b/pkg/chartutil/save_test.go
index 54e7fef79..fb608e5cf 100644
--- a/pkg/chartutil/save_test.go
+++ b/pkg/chartutil/save_test.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
 )
 
 func TestSave(t *testing.T) {
diff --git a/pkg/chartutil/values.go b/pkg/chartutil/values.go
index f71d982ae..fe9152857 100644
--- a/pkg/chartutil/values.go
+++ b/pkg/chartutil/values.go
@@ -26,7 +26,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 // GlobalKey is the name of the Values key that is used for storing global vars.
diff --git a/pkg/chartutil/values_test.go b/pkg/chartutil/values_test.go
index 732f6e6f4..00bcfefed 100644
--- a/pkg/chartutil/values_test.go
+++ b/pkg/chartutil/values_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"text/template"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 func TestReadValues(t *testing.T) {
diff --git a/pkg/cli/environment.go b/pkg/cli/environment.go
index f2483dd19..bbe3e964b 100644
--- a/pkg/cli/environment.go
+++ b/pkg/cli/environment.go
@@ -29,7 +29,7 @@ import (
 
 	"github.com/spf13/pflag"
 
-	"helm.sh/helm/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/helmpath"
 )
 
 // EnvSettings describes all of the environment settings.
diff --git a/pkg/cli/values/options.go b/pkg/cli/values/options.go
index 9eade297e..e6ad71767 100644
--- a/pkg/cli/values/options.go
+++ b/pkg/cli/values/options.go
@@ -25,8 +25,8 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/getter"
-	"helm.sh/helm/pkg/strvals"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/strvals"
 )
 
 type Options struct {
diff --git a/pkg/downloader/chart_downloader.go b/pkg/downloader/chart_downloader.go
index af061dab7..8e251bc89 100644
--- a/pkg/downloader/chart_downloader.go
+++ b/pkg/downloader/chart_downloader.go
@@ -26,11 +26,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/internal/urlutil"
-	"helm.sh/helm/pkg/getter"
-	"helm.sh/helm/pkg/helmpath"
-	"helm.sh/helm/pkg/provenance"
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/internal/urlutil"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/provenance"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 // VerificationStrategy describes a strategy for determining whether to verify a chart.
diff --git a/pkg/downloader/chart_downloader_test.go b/pkg/downloader/chart_downloader_test.go
index 26d19343f..80249e240 100644
--- a/pkg/downloader/chart_downloader_test.go
+++ b/pkg/downloader/chart_downloader_test.go
@@ -21,11 +21,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/cli"
-	"helm.sh/helm/pkg/getter"
-	"helm.sh/helm/pkg/repo"
-	"helm.sh/helm/pkg/repo/repotest"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/cli"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/repo"
+	"helm.sh/helm/v3/pkg/repo/repotest"
 )
 
 const (
diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go
index ef334f130..4b49a7911 100644
--- a/pkg/downloader/manager.go
+++ b/pkg/downloader/manager.go
@@ -30,14 +30,14 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/internal/resolver"
-	"helm.sh/helm/internal/urlutil"
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/getter"
-	"helm.sh/helm/pkg/helmpath"
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/internal/resolver"
+	"helm.sh/helm/v3/internal/urlutil"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 // Manager handles the lifecycle of fetching, resolving, and storing dependencies.
diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go
index ae1f2325a..06c62ecaa 100644
--- a/pkg/downloader/manager_test.go
+++ b/pkg/downloader/manager_test.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 func TestVersionEquals(t *testing.T) {
diff --git a/pkg/engine/doc.go b/pkg/engine/doc.go
index fc96b7bd6..a68b6f7af 100644
--- a/pkg/engine/doc.go
+++ b/pkg/engine/doc.go
@@ -20,4 +20,4 @@ Tiller provides a simple interface for taking a Chart and rendering its template
 The 'engine' package implements this interface using Go's built-in 'text/template'
 package.
 */
-package engine // import "helm.sh/helm/pkg/engine"
+package engine // import "helm.sh/helm/v3/pkg/engine"
diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index 6ff2df799..dae0b6be7 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -28,8 +28,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chartutil"
 )
 
 // Engine is an implementation of 'cmd/tiller/environment'.Engine that uses Go templates.
diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go
index d55f6ae3e..031527dd0 100644
--- a/pkg/engine/engine_test.go
+++ b/pkg/engine/engine_test.go
@@ -22,8 +22,8 @@ import (
 	"sync"
 	"testing"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chartutil"
 )
 
 func TestSortTemplates(t *testing.T) {
diff --git a/pkg/engine/files.go b/pkg/engine/files.go
index 6caf9ca86..3a6659d11 100644
--- a/pkg/engine/files.go
+++ b/pkg/engine/files.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/gobwas/glob"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 // files is a map of files in a chart that can be accessed from a template.
diff --git a/pkg/getter/getter.go b/pkg/getter/getter.go
index fcc90fd3a..e11dbfcae 100644
--- a/pkg/getter/getter.go
+++ b/pkg/getter/getter.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/cli"
+	"helm.sh/helm/v3/pkg/cli"
 )
 
 // options are generic parameters to be provided to the getter during instantiation.
diff --git a/pkg/getter/getter_test.go b/pkg/getter/getter_test.go
index 9b55f86ce..60eb4738e 100644
--- a/pkg/getter/getter_test.go
+++ b/pkg/getter/getter_test.go
@@ -18,7 +18,7 @@ package getter
 import (
 	"testing"
 
-	"helm.sh/helm/pkg/cli"
+	"helm.sh/helm/v3/pkg/cli"
 )
 
 const pluginDir = "testdata/plugins"
diff --git a/pkg/getter/httpgetter.go b/pkg/getter/httpgetter.go
index 2e409c104..320013541 100644
--- a/pkg/getter/httpgetter.go
+++ b/pkg/getter/httpgetter.go
@@ -22,9 +22,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/internal/tlsutil"
-	"helm.sh/helm/internal/urlutil"
-	"helm.sh/helm/internal/version"
+	"helm.sh/helm/v3/internal/tlsutil"
+	"helm.sh/helm/v3/internal/urlutil"
+	"helm.sh/helm/v3/internal/version"
 )
 
 // HTTPGetter is the efault HTTP(/S) backend handler
diff --git a/pkg/getter/httpgetter_test.go b/pkg/getter/httpgetter_test.go
index 3801aa89f..93bfd96b1 100644
--- a/pkg/getter/httpgetter_test.go
+++ b/pkg/getter/httpgetter_test.go
@@ -24,9 +24,9 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/internal/test"
-	"helm.sh/helm/internal/version"
-	"helm.sh/helm/pkg/cli"
+	"helm.sh/helm/v3/internal/test"
+	"helm.sh/helm/v3/internal/version"
+	"helm.sh/helm/v3/pkg/cli"
 )
 
 func TestHTTPGetter(t *testing.T) {
diff --git a/pkg/getter/plugingetter.go b/pkg/getter/plugingetter.go
index a56ba8bbc..0d13ade57 100644
--- a/pkg/getter/plugingetter.go
+++ b/pkg/getter/plugingetter.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/cli"
-	"helm.sh/helm/pkg/plugin"
+	"helm.sh/helm/v3/pkg/cli"
+	"helm.sh/helm/v3/pkg/plugin"
 )
 
 // collectPlugins scans for getter plugins.
diff --git a/pkg/getter/plugingetter_test.go b/pkg/getter/plugingetter_test.go
index ed09babb0..71563e169 100644
--- a/pkg/getter/plugingetter_test.go
+++ b/pkg/getter/plugingetter_test.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/pkg/cli"
+	"helm.sh/helm/v3/pkg/cli"
 )
 
 func TestCollectPlugins(t *testing.T) {
diff --git a/pkg/helmpath/home_unix_test.go b/pkg/helmpath/home_unix_test.go
index 1b813f4c4..6a72152c4 100644
--- a/pkg/helmpath/home_unix_test.go
+++ b/pkg/helmpath/home_unix_test.go
@@ -20,7 +20,7 @@ import (
 	"runtime"
 	"testing"
 
-	"helm.sh/helm/pkg/helmpath/xdg"
+	"helm.sh/helm/v3/pkg/helmpath/xdg"
 )
 
 func TestHelmHome(t *testing.T) {
diff --git a/pkg/helmpath/home_windows_test.go b/pkg/helmpath/home_windows_test.go
index ff1dfd6e7..af74558a8 100644
--- a/pkg/helmpath/home_windows_test.go
+++ b/pkg/helmpath/home_windows_test.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"testing"
 
-	"helm.sh/helm/pkg/helmpath/xdg"
+	"helm.sh/helm/v3/pkg/helmpath/xdg"
 )
 
 func TestHelmHome(t *testing.T) {
diff --git a/pkg/helmpath/lazypath.go b/pkg/helmpath/lazypath.go
index fea018b1e..5fecfc75f 100644
--- a/pkg/helmpath/lazypath.go
+++ b/pkg/helmpath/lazypath.go
@@ -16,7 +16,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"helm.sh/helm/pkg/helmpath/xdg"
+	"helm.sh/helm/v3/pkg/helmpath/xdg"
 )
 
 // lazypath is an lazy-loaded path buffer for the XDG base directory specification.
diff --git a/pkg/helmpath/lazypath_darwin_test.go b/pkg/helmpath/lazypath_darwin_test.go
index ce5240c4e..9381a44e2 100644
--- a/pkg/helmpath/lazypath_darwin_test.go
+++ b/pkg/helmpath/lazypath_darwin_test.go
@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/client-go/util/homedir"
 
-	"helm.sh/helm/pkg/helmpath/xdg"
+	"helm.sh/helm/v3/pkg/helmpath/xdg"
 )
 
 const (
diff --git a/pkg/helmpath/lazypath_unix_test.go b/pkg/helmpath/lazypath_unix_test.go
index 34a1dfff5..96d66e7a5 100644
--- a/pkg/helmpath/lazypath_unix_test.go
+++ b/pkg/helmpath/lazypath_unix_test.go
@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/client-go/util/homedir"
 
-	"helm.sh/helm/pkg/helmpath/xdg"
+	"helm.sh/helm/v3/pkg/helmpath/xdg"
 )
 
 const (
diff --git a/pkg/helmpath/lazypath_windows_test.go b/pkg/helmpath/lazypath_windows_test.go
index c82430a27..d02a0a7f6 100644
--- a/pkg/helmpath/lazypath_windows_test.go
+++ b/pkg/helmpath/lazypath_windows_test.go
@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/client-go/util/homedir"
 
-	"helm.sh/helm/pkg/helmpath/xdg"
+	"helm.sh/helm/v3/pkg/helmpath/xdg"
 )
 
 const (
diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index 9602529be..6f5ce44d2 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kube // import "helm.sh/helm/pkg/kube"
+package kube // import "helm.sh/helm/v3/pkg/kube"
 
 import (
 	"context"
diff --git a/pkg/kube/config.go b/pkg/kube/config.go
index 098aa7503..624c4a1f7 100644
--- a/pkg/kube/config.go
+++ b/pkg/kube/config.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kube // import "helm.sh/helm/pkg/kube"
+package kube // import "helm.sh/helm/v3/pkg/kube"
 
 import "k8s.io/cli-runtime/pkg/genericclioptions"
 
diff --git a/pkg/kube/converter.go b/pkg/kube/converter.go
index d298ad623..a5a6ae1f7 100644
--- a/pkg/kube/converter.go
+++ b/pkg/kube/converter.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kube // import "helm.sh/helm/pkg/kube"
+package kube // import "helm.sh/helm/v3/pkg/kube"
 
 import (
 	"k8s.io/apimachinery/pkg/api/meta"
diff --git a/pkg/kube/factory.go b/pkg/kube/factory.go
index 0ea544943..f47f9d9f6 100644
--- a/pkg/kube/factory.go
+++ b/pkg/kube/factory.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kube // import "helm.sh/helm/pkg/kube"
+package kube // import "helm.sh/helm/v3/pkg/kube"
 
 import (
 	"k8s.io/cli-runtime/pkg/resource"
diff --git a/pkg/kube/fake/fake.go b/pkg/kube/fake/fake.go
index 478cc635a..938f43364 100644
--- a/pkg/kube/fake/fake.go
+++ b/pkg/kube/fake/fake.go
@@ -24,7 +24,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/cli-runtime/pkg/resource"
 
-	"helm.sh/helm/pkg/kube"
+	"helm.sh/helm/v3/pkg/kube"
 )
 
 // FailingKubeClient implements KubeClient for testing purposes. It also has
diff --git a/pkg/kube/fake/printer.go b/pkg/kube/fake/printer.go
index 21c67a63c..4e8344171 100644
--- a/pkg/kube/fake/printer.go
+++ b/pkg/kube/fake/printer.go
@@ -24,7 +24,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/cli-runtime/pkg/resource"
 
-	"helm.sh/helm/pkg/kube"
+	"helm.sh/helm/v3/pkg/kube"
 )
 
 // PrintingKubeClient implements KubeClient, but simply prints the reader to
diff --git a/pkg/kube/resource.go b/pkg/kube/resource.go
index b61c6d198..0f2d94f3a 100644
--- a/pkg/kube/resource.go
+++ b/pkg/kube/resource.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kube // import "helm.sh/helm/pkg/kube"
+package kube // import "helm.sh/helm/v3/pkg/kube"
 
 import "k8s.io/cli-runtime/pkg/resource"
 
diff --git a/pkg/kube/resource_test.go b/pkg/kube/resource_test.go
index 8bf8b0bf5..2e13c3253 100644
--- a/pkg/kube/resource_test.go
+++ b/pkg/kube/resource_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kube // import "helm.sh/helm/pkg/kube"
+package kube // import "helm.sh/helm/v3/pkg/kube"
 
 import (
 	"testing"
diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go
index 4c4bb9ddc..ce0a2b3a3 100644
--- a/pkg/kube/wait.go
+++ b/pkg/kube/wait.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kube // import "helm.sh/helm/pkg/kube"
+package kube // import "helm.sh/helm/v3/pkg/kube"
 
 import (
 	"fmt"
diff --git a/pkg/lint/lint.go b/pkg/lint/lint.go
index e4848e7af..d47951671 100644
--- a/pkg/lint/lint.go
+++ b/pkg/lint/lint.go
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package lint // import "helm.sh/helm/pkg/lint"
+package lint // import "helm.sh/helm/v3/pkg/lint"
 
 import (
 	"path/filepath"
 
-	"helm.sh/helm/pkg/lint/rules"
-	"helm.sh/helm/pkg/lint/support"
+	"helm.sh/helm/v3/pkg/lint/rules"
+	"helm.sh/helm/v3/pkg/lint/support"
 )
 
 // All runs all of the available linters on the given base directory.
diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go
index 770bc2365..b770704c6 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/lint/lint_test.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/pkg/lint/support"
+	"helm.sh/helm/v3/pkg/lint/support"
 )
 
 var values map[string]interface{}
diff --git a/pkg/lint/rules/chartfile.go b/pkg/lint/rules/chartfile.go
index f6b4827df..35bb81571 100644
--- a/pkg/lint/rules/chartfile.go
+++ b/pkg/lint/rules/chartfile.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package rules // import "helm.sh/helm/pkg/lint/rules"
+package rules // import "helm.sh/helm/v3/pkg/lint/rules"
 
 import (
 	"fmt"
@@ -25,9 +25,9 @@ import (
 	"github.com/asaskevich/govalidator"
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/lint/support"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/lint/support"
 )
 
 // Chartfile runs a set of linter rules related to Chart.yaml file
diff --git a/pkg/lint/rules/chartfile_test.go b/pkg/lint/rules/chartfile_test.go
index 4f1694606..ff2a63583 100644
--- a/pkg/lint/rules/chartfile_test.go
+++ b/pkg/lint/rules/chartfile_test.go
@@ -24,9 +24,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/lint/support"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/lint/support"
 )
 
 const (
diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index 36230c4ee..dcbe5bc72 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -23,10 +23,10 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/chart/loader"
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/engine"
-	"helm.sh/helm/pkg/lint/support"
+	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/engine"
+	"helm.sh/helm/v3/pkg/lint/support"
 )
 
 // Templates lints the templates in the Linter.
diff --git a/pkg/lint/rules/template_test.go b/pkg/lint/rules/template_test.go
index c31e695cb..5d6d6ac0c 100644
--- a/pkg/lint/rules/template_test.go
+++ b/pkg/lint/rules/template_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/pkg/lint/support"
+	"helm.sh/helm/v3/pkg/lint/support"
 )
 
 const templateTestBasedir = "./testdata/albatross"
diff --git a/pkg/lint/rules/values.go b/pkg/lint/rules/values.go
index a0310e934..0f202f475 100644
--- a/pkg/lint/rules/values.go
+++ b/pkg/lint/rules/values.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/lint/support"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/lint/support"
 )
 
 // Values lints a chart's values.yaml file.
diff --git a/pkg/lint/support/doc.go b/pkg/lint/support/doc.go
index 4d2ea80af..b9a9d0918 100644
--- a/pkg/lint/support/doc.go
+++ b/pkg/lint/support/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 Linting is the process of testing charts for errors or warnings regarding
 formatting, compilation, or standards compliance.
 */
-package support // import "helm.sh/helm/pkg/lint/support"
+package support // import "helm.sh/helm/v3/pkg/lint/support"
diff --git a/pkg/plugin/cache/cache.go b/pkg/plugin/cache/cache.go
index e5119439e..5f3345b63 100644
--- a/pkg/plugin/cache/cache.go
+++ b/pkg/plugin/cache/cache.go
@@ -14,7 +14,7 @@ limitations under the License.
 */
 
 // Package cache provides a key generator for vcs urls.
-package cache // import "helm.sh/helm/pkg/plugin/cache"
+package cache // import "helm.sh/helm/v3/pkg/plugin/cache"
 
 import (
 	"net/url"
diff --git a/pkg/plugin/hooks.go b/pkg/plugin/hooks.go
index c2fc829dd..e3481515f 100644
--- a/pkg/plugin/hooks.go
+++ b/pkg/plugin/hooks.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package plugin // import "helm.sh/helm/pkg/plugin"
+package plugin // import "helm.sh/helm/v3/pkg/plugin"
 
 // Types of hooks
 const (
diff --git a/pkg/plugin/installer/base.go b/pkg/plugin/installer/base.go
index 12ae8c58c..a8ec97416 100644
--- a/pkg/plugin/installer/base.go
+++ b/pkg/plugin/installer/base.go
@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v3/pkg/plugin/installer"
 
 import (
 	"os"
 	"path/filepath"
 
-	"helm.sh/helm/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/helmpath"
 )
 
 type base struct {
diff --git a/pkg/plugin/installer/doc.go b/pkg/plugin/installer/doc.go
index e5f7c1e45..3e3b2ebeb 100644
--- a/pkg/plugin/installer/doc.go
+++ b/pkg/plugin/installer/doc.go
@@ -14,4 +14,4 @@ limitations under the License.
 */
 
 // Package installer provides an interface for installing Helm plugins.
-package installer // import "helm.sh/helm/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v3/pkg/plugin/installer"
diff --git a/pkg/plugin/installer/http_installer.go b/pkg/plugin/installer/http_installer.go
index 7bb0f34aa..bac495a40 100644
--- a/pkg/plugin/installer/http_installer.go
+++ b/pkg/plugin/installer/http_installer.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v3/pkg/plugin/installer"
 
 import (
 	"archive/tar"
@@ -27,10 +27,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/cli"
-	"helm.sh/helm/pkg/getter"
-	"helm.sh/helm/pkg/helmpath"
-	"helm.sh/helm/pkg/plugin/cache"
+	"helm.sh/helm/v3/pkg/cli"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/plugin/cache"
 )
 
 // HTTPInstaller installs plugins from an archive served by a web server.
diff --git a/pkg/plugin/installer/http_installer_test.go b/pkg/plugin/installer/http_installer_test.go
index 10929a514..a8fa06d79 100644
--- a/pkg/plugin/installer/http_installer_test.go
+++ b/pkg/plugin/installer/http_installer_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v3/pkg/plugin/installer"
 
 import (
 	"bytes"
@@ -23,9 +23,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/getter"
-	"helm.sh/helm/pkg/helmpath"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/helmpath"
 )
 
 var _ Installer = new(HTTPInstaller)
diff --git a/pkg/plugin/installer/local_installer.go b/pkg/plugin/installer/local_installer.go
index a3743d4da..662ef5b29 100644
--- a/pkg/plugin/installer/local_installer.go
+++ b/pkg/plugin/installer/local_installer.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v3/pkg/plugin/installer"
 
 import (
 	"path/filepath"
diff --git a/pkg/plugin/installer/local_installer_test.go b/pkg/plugin/installer/local_installer_test.go
index c21e6afac..d11e44860 100644
--- a/pkg/plugin/installer/local_installer_test.go
+++ b/pkg/plugin/installer/local_installer_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v3/pkg/plugin/installer"
 
 import (
 	"io/ioutil"
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"helm.sh/helm/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/helmpath"
 )
 
 var _ Installer = new(LocalInstaller)
diff --git a/pkg/plugin/installer/vcs_installer.go b/pkg/plugin/installer/vcs_installer.go
index 77846af9c..21a65cd13 100644
--- a/pkg/plugin/installer/vcs_installer.go
+++ b/pkg/plugin/installer/vcs_installer.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v3/pkg/plugin/installer"
 
 import (
 	"os"
@@ -23,8 +23,8 @@ import (
 	"github.com/Masterminds/vcs"
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/pkg/helmpath"
-	"helm.sh/helm/pkg/plugin/cache"
+	"helm.sh/helm/v3/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/plugin/cache"
 )
 
 // VCSInstaller installs plugins from remote a repository.
diff --git a/pkg/plugin/installer/vcs_installer_test.go b/pkg/plugin/installer/vcs_installer_test.go
index f9ffa8ace..ce1ee609e 100644
--- a/pkg/plugin/installer/vcs_installer_test.go
+++ b/pkg/plugin/installer/vcs_installer_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v3/pkg/plugin/installer"
 
 import (
 	"fmt"
@@ -23,8 +23,8 @@ import (
 
 	"github.com/Masterminds/vcs"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/helmpath"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/helmpath"
 )
 
 var _ Installer = new(VCSInstaller)
diff --git a/pkg/plugin/plugin.go b/pkg/plugin/plugin.go
index cfa665d21..2eb354fca 100644
--- a/pkg/plugin/plugin.go
+++ b/pkg/plugin/plugin.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package plugin // import "helm.sh/helm/pkg/plugin"
+package plugin // import "helm.sh/helm/v3/pkg/plugin"
 
 import (
 	"fmt"
@@ -25,7 +25,7 @@ import (
 
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/cli"
+	"helm.sh/helm/v3/pkg/cli"
 )
 
 const pluginFileName = "plugin.yaml"
diff --git a/pkg/plugin/plugin_test.go b/pkg/plugin/plugin_test.go
index dfe607cd6..f637eca28 100644
--- a/pkg/plugin/plugin_test.go
+++ b/pkg/plugin/plugin_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package plugin // import "helm.sh/helm/pkg/plugin"
+package plugin // import "helm.sh/helm/v3/pkg/plugin"
 
 import (
 	"os"
@@ -22,7 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	"helm.sh/helm/pkg/cli"
+	"helm.sh/helm/v3/pkg/cli"
 )
 
 func checkCommand(p *Plugin, extraArgs []string, osStrCmp string, t *testing.T) {
diff --git a/pkg/provenance/doc.go b/pkg/provenance/doc.go
index 2a09c404e..3d2d0ea97 100644
--- a/pkg/provenance/doc.go
+++ b/pkg/provenance/doc.go
@@ -34,4 +34,4 @@ and using `gpg --verify`, `keybase pgp verify`, or similar:
 	gpg: Signature made Mon Jul 25 17:23:44 2016 MDT using RSA key ID 1FC18762
 	gpg: Good signature from "Helm Testing (This key should only be used for testing. DO NOT TRUST.) <helm-testing@helm.sh>" [ultimate]
 */
-package provenance // import "helm.sh/helm/pkg/provenance"
+package provenance // import "helm.sh/helm/v3/pkg/provenance"
diff --git a/pkg/provenance/sign.go b/pkg/provenance/sign.go
index 6e828ff5d..6032eb063 100644
--- a/pkg/provenance/sign.go
+++ b/pkg/provenance/sign.go
@@ -31,8 +31,8 @@ import (
 	"golang.org/x/crypto/openpgp/packet"
 	"sigs.k8s.io/yaml"
 
-	hapi "helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
+	hapi "helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
 )
 
 var defaultPGPConfig = packet.Config{
diff --git a/pkg/release/mock.go b/pkg/release/mock.go
index 32644a3cd..0ad18a8da 100644
--- a/pkg/release/mock.go
+++ b/pkg/release/mock.go
@@ -20,7 +20,7 @@ import (
 	"math/rand"
 	"time"
 
-	"helm.sh/helm/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 // MockHookTemplate is the hook template used for all mock release objects.
diff --git a/pkg/release/release.go b/pkg/release/release.go
index 80813dd7b..a436998aa 100644
--- a/pkg/release/release.go
+++ b/pkg/release/release.go
@@ -15,7 +15,7 @@ limitations under the License.
 
 package release
 
-import "helm.sh/helm/pkg/chart"
+import "helm.sh/helm/v3/pkg/chart"
 
 // Release describes a deployment of a chart, together with the chart
 // and the variables used to deploy that chart.
diff --git a/pkg/releaseutil/filter.go b/pkg/releaseutil/filter.go
index 5bc1d810e..dbd0df8e2 100644
--- a/pkg/releaseutil/filter.go
+++ b/pkg/releaseutil/filter.go
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package releaseutil // import "helm.sh/helm/pkg/releaseutil"
+package releaseutil // import "helm.sh/helm/v3/pkg/releaseutil"
 
-import rspb "helm.sh/helm/pkg/release"
+import rspb "helm.sh/helm/v3/pkg/release"
 
 // FilterFunc returns true if the release object satisfies
 // the predicate of the underlying filter func.
diff --git a/pkg/releaseutil/filter_test.go b/pkg/releaseutil/filter_test.go
index a4f241d9a..31ac306f6 100644
--- a/pkg/releaseutil/filter_test.go
+++ b/pkg/releaseutil/filter_test.go
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package releaseutil // import "helm.sh/helm/pkg/releaseutil"
+package releaseutil // import "helm.sh/helm/v3/pkg/releaseutil"
 
 import (
 	"testing"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 func TestFilterAny(t *testing.T) {
diff --git a/pkg/releaseutil/manifest_sorter.go b/pkg/releaseutil/manifest_sorter.go
index 3e91189e4..68ba1bf5e 100644
--- a/pkg/releaseutil/manifest_sorter.go
+++ b/pkg/releaseutil/manifest_sorter.go
@@ -25,8 +25,8 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 // Manifest represents a manifest file, which has a name and some content.
diff --git a/pkg/releaseutil/manifest_sorter_test.go b/pkg/releaseutil/manifest_sorter_test.go
index a82a1941e..0d2d6660a 100644
--- a/pkg/releaseutil/manifest_sorter_test.go
+++ b/pkg/releaseutil/manifest_sorter_test.go
@@ -22,8 +22,8 @@ import (
 
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/chartutil"
-	"helm.sh/helm/pkg/release"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/release"
 )
 
 func TestSortManifests(t *testing.T) {
diff --git a/pkg/releaseutil/manifest_test.go b/pkg/releaseutil/manifest_test.go
index b667f796f..8664d20ef 100644
--- a/pkg/releaseutil/manifest_test.go
+++ b/pkg/releaseutil/manifest_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package releaseutil // import "helm.sh/helm/pkg/releaseutil"
+package releaseutil // import "helm.sh/helm/v3/pkg/releaseutil"
 
 import (
 	"reflect"
diff --git a/pkg/releaseutil/sorter.go b/pkg/releaseutil/sorter.go
index f500aeea3..1a8aa78a6 100644
--- a/pkg/releaseutil/sorter.go
+++ b/pkg/releaseutil/sorter.go
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package releaseutil // import "helm.sh/helm/pkg/releaseutil"
+package releaseutil // import "helm.sh/helm/v3/pkg/releaseutil"
 
 import (
 	"sort"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 type list []*rspb.Release
diff --git a/pkg/releaseutil/sorter_test.go b/pkg/releaseutil/sorter_test.go
index f7225d6d3..d8b455124 100644
--- a/pkg/releaseutil/sorter_test.go
+++ b/pkg/releaseutil/sorter_test.go
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package releaseutil // import "helm.sh/helm/pkg/releaseutil"
+package releaseutil // import "helm.sh/helm/v3/pkg/releaseutil"
 
 import (
 	"testing"
 	"time"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 // note: this test data is shared with filter_test.go.
diff --git a/pkg/repo/chartrepo.go b/pkg/repo/chartrepo.go
index 1ce869580..a88f68527 100644
--- a/pkg/repo/chartrepo.go
+++ b/pkg/repo/chartrepo.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package repo // import "helm.sh/helm/pkg/repo"
+package repo // import "helm.sh/helm/v3/pkg/repo"
 
 import (
 	"crypto/rand"
@@ -29,10 +29,10 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/chart/loader"
-	"helm.sh/helm/pkg/getter"
-	"helm.sh/helm/pkg/helmpath"
-	"helm.sh/helm/pkg/provenance"
+	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/helmpath"
+	"helm.sh/helm/v3/pkg/provenance"
 )
 
 // Entry represents a collection of parameters for chart repository
diff --git a/pkg/repo/chartrepo_test.go b/pkg/repo/chartrepo_test.go
index d840f963f..9f4273682 100644
--- a/pkg/repo/chartrepo_test.go
+++ b/pkg/repo/chartrepo_test.go
@@ -30,10 +30,10 @@ import (
 
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/cli"
-	"helm.sh/helm/pkg/getter"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/cli"
+	"helm.sh/helm/v3/pkg/getter"
 )
 
 const (
diff --git a/pkg/repo/index.go b/pkg/repo/index.go
index 8a62a8686..8e8f56d47 100644
--- a/pkg/repo/index.go
+++ b/pkg/repo/index.go
@@ -31,10 +31,10 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/internal/urlutil"
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/chart/loader"
-	"helm.sh/helm/pkg/provenance"
+	"helm.sh/helm/v3/internal/urlutil"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/provenance"
 )
 
 var indexPath = "index.yaml"
diff --git a/pkg/repo/index_test.go b/pkg/repo/index_test.go
index c33f257ea..f5203646c 100644
--- a/pkg/repo/index_test.go
+++ b/pkg/repo/index_test.go
@@ -21,9 +21,9 @@ import (
 	"os"
 	"testing"
 
-	"helm.sh/helm/pkg/chart"
-	"helm.sh/helm/pkg/cli"
-	"helm.sh/helm/pkg/getter"
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/cli"
+	"helm.sh/helm/v3/pkg/getter"
 )
 
 const (
diff --git a/pkg/repo/repo.go b/pkg/repo/repo.go
index d6bfc75e7..b73efdd9b 100644
--- a/pkg/repo/repo.go
+++ b/pkg/repo/repo.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package repo // import "helm.sh/helm/pkg/repo"
+package repo // import "helm.sh/helm/v3/pkg/repo"
 
 import (
 	"io/ioutil"
diff --git a/pkg/repo/repotest/server.go b/pkg/repo/repotest/server.go
index b344b336e..96a8bbfcc 100644
--- a/pkg/repo/repotest/server.go
+++ b/pkg/repo/repotest/server.go
@@ -24,7 +24,7 @@ import (
 
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 // NewTempServer creates a server inside of a temp dir.
diff --git a/pkg/repo/repotest/server_test.go b/pkg/repo/repotest/server_test.go
index 77a7855b9..ee62791af 100644
--- a/pkg/repo/repotest/server_test.go
+++ b/pkg/repo/repotest/server_test.go
@@ -23,8 +23,8 @@ import (
 
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/internal/test/ensure"
-	"helm.sh/helm/pkg/repo"
+	"helm.sh/helm/v3/internal/test/ensure"
+	"helm.sh/helm/v3/pkg/repo"
 )
 
 // Young'n, in these here parts, we test our tests.
diff --git a/pkg/storage/driver/cfgmaps.go b/pkg/storage/driver/cfgmaps.go
index 0888cd9f1..1b630f407 100644
--- a/pkg/storage/driver/cfgmaps.go
+++ b/pkg/storage/driver/cfgmaps.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package driver // import "helm.sh/helm/pkg/storage/driver"
+package driver // import "helm.sh/helm/v3/pkg/storage/driver"
 
 import (
 	"strconv"
@@ -29,7 +29,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 var _ Driver = (*ConfigMaps)(nil)
diff --git a/pkg/storage/driver/cfgmaps_test.go b/pkg/storage/driver/cfgmaps_test.go
index 961b68f3b..6efd790ce 100644
--- a/pkg/storage/driver/cfgmaps_test.go
+++ b/pkg/storage/driver/cfgmaps_test.go
@@ -21,7 +21,7 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 func TestConfigMapName(t *testing.T) {
diff --git a/pkg/storage/driver/driver.go b/pkg/storage/driver/driver.go
index b562376d2..9a1fbc579 100644
--- a/pkg/storage/driver/driver.go
+++ b/pkg/storage/driver/driver.go
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package driver // import "helm.sh/helm/pkg/storage/driver"
+package driver // import "helm.sh/helm/v3/pkg/storage/driver"
 
 import (
 	"github.com/pkg/errors"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 var (
diff --git a/pkg/storage/driver/labels_test.go b/pkg/storage/driver/labels_test.go
index fd17faef5..bfd80911b 100644
--- a/pkg/storage/driver/labels_test.go
+++ b/pkg/storage/driver/labels_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package driver // import "helm.sh/helm/pkg/storage/driver"
+package driver // import "helm.sh/helm/v3/pkg/storage/driver"
 
 import (
 	"testing"
diff --git a/pkg/storage/driver/memory.go b/pkg/storage/driver/memory.go
index 5d91767a2..ca8756c0c 100644
--- a/pkg/storage/driver/memory.go
+++ b/pkg/storage/driver/memory.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"sync"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 var _ Driver = (*Memory)(nil)
diff --git a/pkg/storage/driver/memory_test.go b/pkg/storage/driver/memory_test.go
index e05a196b0..c74df9432 100644
--- a/pkg/storage/driver/memory_test.go
+++ b/pkg/storage/driver/memory_test.go
@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"testing"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 func TestMemoryName(t *testing.T) {
diff --git a/pkg/storage/driver/mock_test.go b/pkg/storage/driver/mock_test.go
index 10eb6d3fe..4c9b4ef9c 100644
--- a/pkg/storage/driver/mock_test.go
+++ b/pkg/storage/driver/mock_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package driver // import "helm.sh/helm/pkg/storage/driver"
+package driver // import "helm.sh/helm/v3/pkg/storage/driver"
 
 import (
 	"fmt"
@@ -25,7 +25,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 func releaseStub(name string, vers int, namespace string, status rspb.Status) *rspb.Release {
diff --git a/pkg/storage/driver/records.go b/pkg/storage/driver/records.go
index ee05f6676..9df173384 100644
--- a/pkg/storage/driver/records.go
+++ b/pkg/storage/driver/records.go
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package driver // import "helm.sh/helm/pkg/storage/driver"
+package driver // import "helm.sh/helm/v3/pkg/storage/driver"
 
 import (
 	"sort"
 	"strconv"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 // records holds a list of in-memory release records
diff --git a/pkg/storage/driver/records_test.go b/pkg/storage/driver/records_test.go
index bb325ef68..79b60044f 100644
--- a/pkg/storage/driver/records_test.go
+++ b/pkg/storage/driver/records_test.go
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package driver // import "helm.sh/helm/pkg/storage/driver"
+package driver // import "helm.sh/helm/v3/pkg/storage/driver"
 
 import (
 	"testing"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 func TestRecordsAdd(t *testing.T) {
diff --git a/pkg/storage/driver/secrets.go b/pkg/storage/driver/secrets.go
index edd1cca0d..eea285be1 100644
--- a/pkg/storage/driver/secrets.go
+++ b/pkg/storage/driver/secrets.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package driver // import "helm.sh/helm/pkg/storage/driver"
+package driver // import "helm.sh/helm/v3/pkg/storage/driver"
 
 import (
 	"strconv"
@@ -29,7 +29,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 var _ Driver = (*Secrets)(nil)
diff --git a/pkg/storage/driver/secrets_test.go b/pkg/storage/driver/secrets_test.go
index fdcd40d1f..892482e5b 100644
--- a/pkg/storage/driver/secrets_test.go
+++ b/pkg/storage/driver/secrets_test.go
@@ -21,7 +21,7 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 func TestSecretName(t *testing.T) {
diff --git a/pkg/storage/driver/util.go b/pkg/storage/driver/util.go
index 5846c60f2..6cde74cd3 100644
--- a/pkg/storage/driver/util.go
+++ b/pkg/storage/driver/util.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package driver // import "helm.sh/helm/pkg/storage/driver"
+package driver // import "helm.sh/helm/v3/pkg/storage/driver"
 
 import (
 	"bytes"
@@ -23,7 +23,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 
-	rspb "helm.sh/helm/pkg/release"
+	rspb "helm.sh/helm/v3/pkg/release"
 )
 
 var b64 = base64.StdEncoding
diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
index e676ac474..58a7eb06f 100644
--- a/pkg/storage/storage.go
+++ b/pkg/storage/storage.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package storage // import "helm.sh/helm/pkg/storage"
+package storage // import "helm.sh/helm/v3/pkg/storage"
 
 import (
 	"fmt"
@@ -22,9 +22,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	rspb "helm.sh/helm/pkg/release"
-	relutil "helm.sh/helm/pkg/releaseutil"
-	"helm.sh/helm/pkg/storage/driver"
+	rspb "helm.sh/helm/v3/pkg/release"
+	relutil "helm.sh/helm/v3/pkg/releaseutil"
+	"helm.sh/helm/v3/pkg/storage/driver"
 )
 
 // The type field of the Kubernetes storage object which stores the Helm release
diff --git a/pkg/storage/storage_test.go b/pkg/storage/storage_test.go
index 25572ae96..b8c333d24 100644
--- a/pkg/storage/storage_test.go
+++ b/pkg/storage/storage_test.go
@@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package storage // import "helm.sh/helm/pkg/storage"
+package storage // import "helm.sh/helm/v3/pkg/storage"
 
 import (
 	"fmt"
 	"reflect"
 	"testing"
 
-	rspb "helm.sh/helm/pkg/release"
-	"helm.sh/helm/pkg/storage/driver"
+	rspb "helm.sh/helm/v3/pkg/release"
+	"helm.sh/helm/v3/pkg/storage/driver"
 )
 
 func TestStorageCreate(t *testing.T) {