Repository: heketi/heketi (language: python)

Issue:
go mod download github.com/heketi/heketi@v10.4.0 fails
<!--
This issue template is meant mainly for bug reports.

Please note that the heketi project is in maintenance only. Feature requests are
highly unlikely to be accepted. Only major defects and security issues are likely
to be considered.

If you are using an issue for general help please be aware that our ability to
assist with heketi is severly limited, responses may be slow, and questions that
lack sufficient detail may go unanswered.

-->

### Kind of issue
 
Bug

### Observed behavior

`go mod download github.com/heketi/heketi@v10.4.0` fails with the following message:

```
$ go mod download github.com/heketi/heketi@v10.4.0
go: github.com/heketi/heketi@v10.4.0+incompatible: invalid version: module contains a go.mod file, so module path must match major version ("github.com/heketi/heketi/v10")
```

### Expected/desired behavior

Kubernetes script for updating dependencies uses `go mod download` command and the v10.4.0 prevents us from upgrading. Please note, that the previous version worked fine:

```
$ go mod download github.com/heketi/heketi@v10.3.0
$ echo $?
0
```

### Details on how to reproduce (minimal and precise)

```
$ go mod download github.com/heketi/heketi@v10.4.0
go: github.com/heketi/heketi@v10.4.0+incompatible: invalid version: module contains a go.mod file, so module path must match major version ("github.com/heketi/heketi/v10")
```

### Information about the environment:

- Heketi version used (e.g. v6.0.0 or master): v10.4.0
- Operating system used: Linux
- Heketi compiled from sources, as a package (rpm/deb), or container: referenced from Kubernetes repo
- Using kubernetes, openshift, or direct install: Kubernetes repo, see https://github.com/kubernetes/kubernetes/issues/104007
- If kubernetes/openshift, is gluster running inside kubernetes/openshift or outside: 
- If kubernetes/openshift, how was it deployed (gk-deploy, openshift-ansible, other, custom): 


### Other useful information

xref: https://github.com/kubernetes/kubernetes/issues/104007



Discussion / hints:
xref: https://kubernetes.slack.com/archives/C09QZFCE5/p1650437188540879
See https://github.com/heketi/heketi/pull/1867/files#r853806978

Fix patch:
diff --git a/apps/app.go b/apps/app.go
index 07625611da..25d00aa52d 100644
--- a/apps/app.go
+++ b/apps/app.go
@@ -13,7 +13,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 type Application interface {
diff --git a/apps/glusterfs/allocator.go b/apps/glusterfs/allocator.go
index 356c18a91f..ed1a171d73 100644
--- a/apps/glusterfs/allocator.go
+++ b/apps/glusterfs/allocator.go
@@ -10,7 +10,7 @@
 package glusterfs
 
 import (
-	wdb "github.com/heketi/heketi/pkg/db"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
 )
 
 type Allocator interface {
diff --git a/apps/glusterfs/app.go b/apps/glusterfs/app.go
index 7d12a65ce2..32e5c1982a 100644
--- a/apps/glusterfs/app.go
+++ b/apps/glusterfs/app.go
@@ -21,13 +21,13 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/lpabon/godbc"
 
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/executors/injectexec"
-	"github.com/heketi/heketi/executors/kubeexec"
-	"github.com/heketi/heketi/executors/mockexec"
-	"github.com/heketi/heketi/executors/sshexec"
-	"github.com/heketi/heketi/pkg/logging"
-	"github.com/heketi/heketi/server/rest"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/executors/injectexec"
+	"github.com/heketi/heketi/v10/executors/kubeexec"
+	"github.com/heketi/heketi/v10/executors/mockexec"
+	"github.com/heketi/heketi/v10/executors/sshexec"
+	"github.com/heketi/heketi/v10/pkg/logging"
+	"github.com/heketi/heketi/v10/server/rest"
 )
 
 const (
diff --git a/apps/glusterfs/app_block_volume.go b/apps/glusterfs/app_block_volume.go
index 95a3f9e18d..86f7017209 100644
--- a/apps/glusterfs/app_block_volume.go
+++ b/apps/glusterfs/app_block_volume.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/gorilla/mux"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (a *App) BlockVolumeCreate(w http.ResponseWriter, r *http.Request) {
diff --git a/apps/glusterfs/app_cluster.go b/apps/glusterfs/app_cluster.go
index 559be0b9b1..fc6e8a3fc7 100644
--- a/apps/glusterfs/app_cluster.go
+++ b/apps/glusterfs/app_cluster.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/gorilla/mux"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (a *App) ClusterCreate(w http.ResponseWriter, r *http.Request) {
diff --git a/apps/glusterfs/app_config.go b/apps/glusterfs/app_config.go
index 119b29d45b..d930a00a69 100644
--- a/apps/glusterfs/app_config.go
+++ b/apps/glusterfs/app_config.go
@@ -10,9 +10,9 @@
 package glusterfs
 
 import (
-	"github.com/heketi/heketi/executors/injectexec"
-	"github.com/heketi/heketi/executors/kubeexec"
-	"github.com/heketi/heketi/executors/sshexec"
+	"github.com/heketi/heketi/v10/executors/injectexec"
+	"github.com/heketi/heketi/v10/executors/kubeexec"
+	"github.com/heketi/heketi/v10/executors/sshexec"
 )
 
 type RetryLimitConfig struct {
diff --git a/apps/glusterfs/app_device.go b/apps/glusterfs/app_device.go
index 4e41129f90..3d333749af 100644
--- a/apps/glusterfs/app_device.go
+++ b/apps/glusterfs/app_device.go
@@ -17,10 +17,10 @@ import (
 	"github.com/boltdb/bolt"
 	"github.com/gorilla/mux"
 
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (a *App) DeviceAdd(w http.ResponseWriter, r *http.Request) {
diff --git a/apps/glusterfs/app_logging.go b/apps/glusterfs/app_logging.go
index 5e5ba62d9b..74207cbd74 100644
--- a/apps/glusterfs/app_logging.go
+++ b/apps/glusterfs/app_logging.go
@@ -14,9 +14,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/logging"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/logging"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (a *App) logLevelName() string {
diff --git a/apps/glusterfs/app_middleware.go b/apps/glusterfs/app_middleware.go
index e66c400a8b..e8e751df74 100644
--- a/apps/glusterfs/app_middleware.go
+++ b/apps/glusterfs/app_middleware.go
@@ -16,8 +16,8 @@ import (
 	jwt "github.com/golang-jwt/jwt"
 	"github.com/urfave/negroni"
 
-	"github.com/heketi/heketi/middleware"
-	"github.com/heketi/heketi/pkg/kubernetes"
+	"github.com/heketi/heketi/v10/middleware"
+	"github.com/heketi/heketi/v10/pkg/kubernetes"
 )
 
 var (
diff --git a/apps/glusterfs/app_node.go b/apps/glusterfs/app_node.go
index a6facacfed..3b5c490694 100644
--- a/apps/glusterfs/app_node.go
+++ b/apps/glusterfs/app_node.go
@@ -15,9 +15,9 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/gorilla/mux"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (a *App) NodeAdd(w http.ResponseWriter, r *http.Request) {
diff --git a/apps/glusterfs/app_operations.go b/apps/glusterfs/app_operations.go
index c4c41baf15..7e27012d21 100644
--- a/apps/glusterfs/app_operations.go
+++ b/apps/glusterfs/app_operations.go
@@ -17,8 +17,8 @@ import (
 	"github.com/boltdb/bolt"
 	"github.com/gorilla/mux"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (a *App) AppOperationsInfo() (*api.OperationsInfo, error) {
diff --git a/apps/glusterfs/app_topology.go b/apps/glusterfs/app_topology.go
index 19794c0a29..e744d2e71c 100644
--- a/apps/glusterfs/app_topology.go
+++ b/apps/glusterfs/app_topology.go
@@ -11,7 +11,7 @@ package glusterfs
 
 import (
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 func (a *App) TopologyInfo() (*api.TopologyInfoResponse, error) {
diff --git a/apps/glusterfs/app_volume.go b/apps/glusterfs/app_volume.go
index b134f9142b..630874ed81 100644
--- a/apps/glusterfs/app_volume.go
+++ b/apps/glusterfs/app_volume.go
@@ -17,9 +17,9 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/gorilla/mux"
-	"github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 const (
diff --git a/apps/glusterfs/block_volume_entry.go b/apps/glusterfs/block_volume_entry.go
index dcc2452188..c19d2f90a1 100644
--- a/apps/glusterfs/block_volume_entry.go
+++ b/apps/glusterfs/block_volume_entry.go
@@ -15,11 +15,11 @@ import (
 	"fmt"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
-	"github.com/heketi/heketi/pkg/sortedstrings"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/sortedstrings"
 	"github.com/lpabon/godbc"
 )
 
diff --git a/apps/glusterfs/block_volume_entry_create.go b/apps/glusterfs/block_volume_entry_create.go
index 99cef5307c..3426073b7e 100644
--- a/apps/glusterfs/block_volume_entry_create.go
+++ b/apps/glusterfs/block_volume_entry_create.go
@@ -14,8 +14,8 @@ import (
 	"math/rand"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
 	"github.com/lpabon/godbc"
 )
 
diff --git a/apps/glusterfs/brick_allocate.go b/apps/glusterfs/brick_allocate.go
index 64acb159df..1015d4699a 100644
--- a/apps/glusterfs/brick_allocate.go
+++ b/apps/glusterfs/brick_allocate.go
@@ -15,7 +15,7 @@ import (
 	"github.com/boltdb/bolt"
 	"github.com/lpabon/godbc"
 
-	"github.com/heketi/heketi/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/idgen"
 )
 
 type BrickSet struct {
diff --git a/apps/glusterfs/brick_create.go b/apps/glusterfs/brick_create.go
index 6c9f378561..19e0ddfe20 100644
--- a/apps/glusterfs/brick_create.go
+++ b/apps/glusterfs/brick_create.go
@@ -12,9 +12,9 @@ package glusterfs
 import (
 	"sync"
 
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 // ReclaimMap tracks what bricks freed underlying storage when deleted.
diff --git a/apps/glusterfs/brick_entry.go b/apps/glusterfs/brick_entry.go
index 3ccf5db132..c62d30fab6 100644
--- a/apps/glusterfs/brick_entry.go
+++ b/apps/glusterfs/brick_entry.go
@@ -16,12 +16,12 @@ import (
 	"strings"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
-	"github.com/heketi/heketi/pkg/paths"
-	"github.com/heketi/heketi/pkg/sortedstrings"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/paths"
+	"github.com/heketi/heketi/v10/pkg/sortedstrings"
 	"github.com/lpabon/godbc"
 )
 
diff --git a/apps/glusterfs/cluster_entry.go b/apps/glusterfs/cluster_entry.go
index 0428218592..2fdec29f0c 100644
--- a/apps/glusterfs/cluster_entry.go
+++ b/apps/glusterfs/cluster_entry.go
@@ -16,10 +16,10 @@ import (
 	"sort"
 
 	"github.com/boltdb/bolt"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
-	"github.com/heketi/heketi/pkg/sortedstrings"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/sortedstrings"
 	"github.com/lpabon/godbc"
 )
 
diff --git a/apps/glusterfs/db_operations.go b/apps/glusterfs/db_operations.go
index f8bcba0df1..0766b50f34 100644
--- a/apps/glusterfs/db_operations.go
+++ b/apps/glusterfs/db_operations.go
@@ -16,8 +16,8 @@ import (
 	"strings"
 
 	"github.com/boltdb/bolt"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 func dbDumpInternal(db wdb.DB) (Db, error) {
diff --git a/apps/glusterfs/dbcommon.go b/apps/glusterfs/dbcommon.go
index 0f87f8f940..8eb3b44207 100644
--- a/apps/glusterfs/dbcommon.go
+++ b/apps/glusterfs/dbcommon.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/boltdb/bolt"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
 )
 
 const (
diff --git a/apps/glusterfs/dbexamples.go b/apps/glusterfs/dbexamples.go
index 820c31c755..8fd7db1247 100644
--- a/apps/glusterfs/dbexamples.go
+++ b/apps/glusterfs/dbexamples.go
@@ -16,7 +16,7 @@ import (
 	"testing"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/device_entry.go b/apps/glusterfs/device_entry.go
index 4b773b3846..daa5a3d8aa 100644
--- a/apps/glusterfs/device_entry.go
+++ b/apps/glusterfs/device_entry.go
@@ -16,11 +16,11 @@ import (
 	"sort"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
-	"github.com/heketi/heketi/pkg/sortedstrings"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/sortedstrings"
 	"github.com/lpabon/godbc"
 )
 
diff --git a/apps/glusterfs/entry.go b/apps/glusterfs/entry.go
index f17cf39c25..7d1305baee 100644
--- a/apps/glusterfs/entry.go
+++ b/apps/glusterfs/entry.go
@@ -10,7 +10,7 @@
 package glusterfs
 
 import (
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 type Entry struct {
diff --git a/apps/glusterfs/examiner.go b/apps/glusterfs/examiner.go
index dd06eb1bed..d68323ad0a 100644
--- a/apps/glusterfs/examiner.go
+++ b/apps/glusterfs/examiner.go
@@ -15,7 +15,7 @@ import (
 	"sort"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/executors"
+	"github.com/heketi/heketi/v10/executors"
 )
 
 type ExaminerMode string
diff --git a/apps/glusterfs/health_cache.go b/apps/glusterfs/health_cache.go
index b1c9b8375a..96937c36bb 100644
--- a/apps/glusterfs/health_cache.go
+++ b/apps/glusterfs/health_cache.go
@@ -16,8 +16,8 @@ import (
 
 	"github.com/boltdb/bolt"
 
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
 )
 
 var (
diff --git a/apps/glusterfs/listing.go b/apps/glusterfs/listing.go
index bc25835aa5..e034ef0fe1 100644
--- a/apps/glusterfs/listing.go
+++ b/apps/glusterfs/listing.go
@@ -12,7 +12,7 @@ package glusterfs
 import (
 	"github.com/boltdb/bolt"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 // ListCompleteVolumes returns a list of volume ID strings for volumes
diff --git a/apps/glusterfs/node_entry.go b/apps/glusterfs/node_entry.go
index a3da481ca9..056c2eb065 100644
--- a/apps/glusterfs/node_entry.go
+++ b/apps/glusterfs/node_entry.go
@@ -16,11 +16,11 @@ import (
 	"sort"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
-	"github.com/heketi/heketi/pkg/sortedstrings"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/sortedstrings"
 	"github.com/lpabon/godbc"
 )
 
diff --git a/apps/glusterfs/operations.go b/apps/glusterfs/operations.go
index c8fbe0a880..4ccf25cb51 100644
--- a/apps/glusterfs/operations.go
+++ b/apps/glusterfs/operations.go
@@ -12,8 +12,8 @@ package glusterfs
 import (
 	"fmt"
 
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
 
 	"github.com/boltdb/bolt"
 )
diff --git a/apps/glusterfs/operations_block_restriction.go b/apps/glusterfs/operations_block_restriction.go
index 1ce31510e8..4ac88cde4e 100644
--- a/apps/glusterfs/operations_block_restriction.go
+++ b/apps/glusterfs/operations_block_restriction.go
@@ -12,9 +12,9 @@ package glusterfs
 import (
 	"fmt"
 
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 
 	"github.com/boltdb/bolt"
 )
diff --git a/apps/glusterfs/operations_block_volume.go b/apps/glusterfs/operations_block_volume.go
index 291cbfc6a5..8685f03b80 100644
--- a/apps/glusterfs/operations_block_volume.go
+++ b/apps/glusterfs/operations_block_volume.go
@@ -13,8 +13,8 @@ import (
 	"fmt"
 	"math/rand"
 
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
 
 	"github.com/boltdb/bolt"
 )
diff --git a/apps/glusterfs/operations_cleanup.go b/apps/glusterfs/operations_cleanup.go
index 82c6e601b9..32bfbb9ec6 100644
--- a/apps/glusterfs/operations_cleanup.go
+++ b/apps/glusterfs/operations_cleanup.go
@@ -13,8 +13,8 @@ import (
 	"errors"
 	"time"
 
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
 
 	"github.com/boltdb/bolt"
 )
diff --git a/apps/glusterfs/operations_device.go b/apps/glusterfs/operations_device.go
index 39e716f730..b5012e1802 100644
--- a/apps/glusterfs/operations_device.go
+++ b/apps/glusterfs/operations_device.go
@@ -12,9 +12,9 @@ package glusterfs
 import (
 	"fmt"
 
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 
 	"github.com/boltdb/bolt"
 )
diff --git a/apps/glusterfs/operations_load.go b/apps/glusterfs/operations_load.go
index 254e54e81f..d032c00148 100644
--- a/apps/glusterfs/operations_load.go
+++ b/apps/glusterfs/operations_load.go
@@ -12,8 +12,8 @@ package glusterfs
 import (
 	"fmt"
 
-	_ "github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
+	_ "github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
 )
 
 type ErrNotLoadable struct {
diff --git a/apps/glusterfs/operations_manage.go b/apps/glusterfs/operations_manage.go
index 7c3676e418..2c848f4477 100644
--- a/apps/glusterfs/operations_manage.go
+++ b/apps/glusterfs/operations_manage.go
@@ -16,8 +16,8 @@ import (
 
 	"github.com/lpabon/godbc"
 
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/pkg/idgen"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/pkg/idgen"
 )
 
 type OpClass int
diff --git a/apps/glusterfs/operations_volume.go b/apps/glusterfs/operations_volume.go
index 2b57879c7a..8c46d7b133 100644
--- a/apps/glusterfs/operations_volume.go
+++ b/apps/glusterfs/operations_volume.go
@@ -12,8 +12,8 @@ package glusterfs
 import (
 	"fmt"
 
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
 
 	"github.com/boltdb/bolt"
 )
diff --git a/apps/glusterfs/pendingop_entry.go b/apps/glusterfs/pendingop_entry.go
index e8fcc8ec31..a685fb3d4f 100644
--- a/apps/glusterfs/pendingop_entry.go
+++ b/apps/glusterfs/pendingop_entry.go
@@ -16,9 +16,9 @@ import (
 	"time"
 
 	"github.com/boltdb/bolt"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
 	"github.com/lpabon/godbc"
 )
 
diff --git a/apps/glusterfs/placer_arbiter.go b/apps/glusterfs/placer_arbiter.go
index e754790ce6..a118ab88c6 100644
--- a/apps/glusterfs/placer_arbiter.go
+++ b/apps/glusterfs/placer_arbiter.go
@@ -12,7 +12,7 @@ package glusterfs
 import (
 	"fmt"
 
-	"github.com/heketi/heketi/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/idgen"
 )
 
 var (
diff --git a/apps/glusterfs/tags.go b/apps/glusterfs/tags.go
index b83b859abe..1acdebc59c 100644
--- a/apps/glusterfs/tags.go
+++ b/apps/glusterfs/tags.go
@@ -10,7 +10,7 @@
 package glusterfs
 
 import (
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 // Well-known tags
diff --git a/apps/glusterfs/update_db_vol.go b/apps/glusterfs/update_db_vol.go
index a6305b802b..a9edf9af36 100644
--- a/apps/glusterfs/update_db_vol.go
+++ b/apps/glusterfs/update_db_vol.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/boltdb/bolt"
 
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/pkg/db"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/pkg/db"
 )
 
 func UpdateDbVol(app *App, volName string) error {
diff --git a/apps/glusterfs/volume_durability.go b/apps/glusterfs/volume_durability.go
index 6596962140..75bff3f594 100644
--- a/apps/glusterfs/volume_durability.go
+++ b/apps/glusterfs/volume_durability.go
@@ -10,7 +10,7 @@
 package glusterfs
 
 import (
-	"github.com/heketi/heketi/executors"
+	"github.com/heketi/heketi/v10/executors"
 )
 
 type VolumeDurability interface {
diff --git a/apps/glusterfs/volume_durability_ec.go b/apps/glusterfs/volume_durability_ec.go
index c10aa50ae7..dde1a601c3 100644
--- a/apps/glusterfs/volume_durability_ec.go
+++ b/apps/glusterfs/volume_durability_ec.go
@@ -12,8 +12,8 @@ package glusterfs
 import (
 	"encoding/gob"
 
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 func init() {
diff --git a/apps/glusterfs/volume_durability_none.go b/apps/glusterfs/volume_durability_none.go
index cc61933cd3..509007ab13 100644
--- a/apps/glusterfs/volume_durability_none.go
+++ b/apps/glusterfs/volume_durability_none.go
@@ -12,7 +12,7 @@ package glusterfs
 import (
 	"encoding/gob"
 
-	"github.com/heketi/heketi/executors"
+	"github.com/heketi/heketi/v10/executors"
 )
 
 func init() {
diff --git a/apps/glusterfs/volume_durability_replica.go b/apps/glusterfs/volume_durability_replica.go
index 678d2f7892..351c7f4c32 100644
--- a/apps/glusterfs/volume_durability_replica.go
+++ b/apps/glusterfs/volume_durability_replica.go
@@ -12,8 +12,8 @@ package glusterfs
 import (
 	"encoding/gob"
 
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 func init() {
diff --git a/apps/glusterfs/volume_entry.go b/apps/glusterfs/volume_entry.go
index 86734e3783..20d720f84a 100644
--- a/apps/glusterfs/volume_entry.go
+++ b/apps/glusterfs/volume_entry.go
@@ -19,12 +19,12 @@ import (
 	"strings"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
-	"github.com/heketi/heketi/pkg/paths"
-	"github.com/heketi/heketi/pkg/sortedstrings"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/paths"
+	"github.com/heketi/heketi/v10/pkg/sortedstrings"
 	"github.com/lpabon/godbc"
 )
 
diff --git a/apps/glusterfs/volume_entry_allocate.go b/apps/glusterfs/volume_entry_allocate.go
index 69b017511b..31a0485e83 100644
--- a/apps/glusterfs/volume_entry_allocate.go
+++ b/apps/glusterfs/volume_entry_allocate.go
@@ -13,9 +13,9 @@ import (
 	"fmt"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 func (v *VolumeEntry) allocBricksInCluster(db wdb.DB,
diff --git a/apps/glusterfs/volume_entry_create.go b/apps/glusterfs/volume_entry_create.go
index bd76521905..474318a10c 100644
--- a/apps/glusterfs/volume_entry_create.go
+++ b/apps/glusterfs/volume_entry_create.go
@@ -14,9 +14,9 @@ import (
 	"strings"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/lpabon/godbc"
 )
 
diff --git a/apps/glusterfs/zone_filter.go b/apps/glusterfs/zone_filter.go
index 2dc9d47dbd..01a31ea376 100644
--- a/apps/glusterfs/zone_filter.go
+++ b/apps/glusterfs/zone_filter.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/boltdb/bolt"
 
-	wdb "github.com/heketi/heketi/pkg/db"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
 )
 
 type DeviceZoneMap struct {
diff --git a/client/api/go-client/admin.go b/client/api/go-client/admin.go
index f47cf23610..f1234b7dfc 100644
--- a/client/api/go-client/admin.go
+++ b/client/api/go-client/admin.go
@@ -17,8 +17,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (c *Client) AdminStatusGet() (*api.AdminStatus, error) {
diff --git a/client/api/go-client/backup.go b/client/api/go-client/backup.go
index 0690b3f417..d677d54f8b 100644
--- a/client/api/go-client/backup.go
+++ b/client/api/go-client/backup.go
@@ -16,7 +16,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (c *Client) BackupDb(w io.Writer) error {
diff --git a/client/api/go-client/block_volume.go b/client/api/go-client/block_volume.go
index bee4a2a0c6..40f6154849 100644
--- a/client/api/go-client/block_volume.go
+++ b/client/api/go-client/block_volume.go
@@ -17,8 +17,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (c *Client) BlockVolumeCreate(request *api.BlockVolumeCreateRequest) (
diff --git a/client/api/go-client/brick.go b/client/api/go-client/brick.go
index 2bd81568de..77fb0f9b56 100644
--- a/client/api/go-client/brick.go
+++ b/client/api/go-client/brick.go
@@ -18,8 +18,8 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 // BrickEvict requests that Heketi evict the given brick from the
diff --git a/client/api/go-client/client.go b/client/api/go-client/client.go
index f620ee5b73..7669094fbd 100644
--- a/client/api/go-client/client.go
+++ b/client/api/go-client/client.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	jwt "github.com/golang-jwt/jwt"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 const (
diff --git a/client/api/go-client/cluster.go b/client/api/go-client/cluster.go
index b68a9e4372..f3fdb6ad86 100644
--- a/client/api/go-client/cluster.go
+++ b/client/api/go-client/cluster.go
@@ -17,8 +17,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (c *Client) ClusterCreate(request *api.ClusterCreateRequest) (*api.ClusterInfoResponse, error) {
diff --git a/client/api/go-client/db.go b/client/api/go-client/db.go
index 2d33a160ec..c6800add82 100644
--- a/client/api/go-client/db.go
+++ b/client/api/go-client/db.go
@@ -16,7 +16,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 // DbDump provides a JSON representation of current state of DB
diff --git a/client/api/go-client/device.go b/client/api/go-client/device.go
index 32d3c27831..5813b09d27 100644
--- a/client/api/go-client/device.go
+++ b/client/api/go-client/device.go
@@ -18,8 +18,8 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (c *Client) DeviceAdd(request *api.DeviceAddRequest) error {
diff --git a/client/api/go-client/logging.go b/client/api/go-client/logging.go
index 96a29d2ec7..1e4bcf46da 100644
--- a/client/api/go-client/logging.go
+++ b/client/api/go-client/logging.go
@@ -17,8 +17,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (c *Client) LogLevelGet() (*api.LogLevelInfo, error) {
diff --git a/client/api/go-client/node.go b/client/api/go-client/node.go
index 4e66ac7a57..7b1277c44f 100644
--- a/client/api/go-client/node.go
+++ b/client/api/go-client/node.go
@@ -17,8 +17,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (c *Client) NodeAdd(request *api.NodeAddRequest) (*api.NodeInfoResponse, error) {
diff --git a/client/api/go-client/operations.go b/client/api/go-client/operations.go
index f5eab65dda..e46ae5944b 100644
--- a/client/api/go-client/operations.go
+++ b/client/api/go-client/operations.go
@@ -17,8 +17,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (c *Client) OperationsInfo() (*api.OperationsInfo, error) {
diff --git a/client/api/go-client/state.go b/client/api/go-client/state.go
index df2271935c..a48d30e723 100644
--- a/client/api/go-client/state.go
+++ b/client/api/go-client/state.go
@@ -16,7 +16,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 // StateExamineGluster provides a comparision of DB and Gluster
diff --git a/client/api/go-client/topology.go b/client/api/go-client/topology.go
index 549aa7c75c..555da44e32 100644
--- a/client/api/go-client/topology.go
+++ b/client/api/go-client/topology.go
@@ -13,7 +13,7 @@
 package client
 
 import (
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 func (c *Client) TopologyInfo() (*api.TopologyInfoResponse, error) {
diff --git a/client/api/go-client/volume.go b/client/api/go-client/volume.go
index 7092613f8b..f15f39deb1 100644
--- a/client/api/go-client/volume.go
+++ b/client/api/go-client/volume.go
@@ -17,8 +17,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 func (c *Client) VolumeCreate(request *api.VolumeCreateRequest) (
diff --git a/client/cli/go/cmds/block_volume.go b/client/cli/go/cmds/block_volume.go
index 24525aff6c..1e3379c5c1 100644
--- a/client/cli/go/cmds/block_volume.go
+++ b/client/cli/go/cmds/block_volume.go
@@ -15,7 +15,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/spf13/cobra"
 )
 
diff --git a/client/cli/go/cmds/brick.go b/client/cli/go/cmds/brick.go
index bd151948c8..327973490f 100644
--- a/client/cli/go/cmds/brick.go
+++ b/client/cli/go/cmds/brick.go
@@ -13,7 +13,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/spf13/cobra"
 )
 
diff --git a/client/cli/go/cmds/cluster.go b/client/cli/go/cmds/cluster.go
index a35fa359d1..7b4134a31f 100644
--- a/client/cli/go/cmds/cluster.go
+++ b/client/cli/go/cmds/cluster.go
@@ -16,7 +16,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/spf13/cobra"
 )
 
diff --git a/client/cli/go/cmds/device.go b/client/cli/go/cmds/device.go
index 61aa0eb801..b522653024 100644
--- a/client/cli/go/cmds/device.go
+++ b/client/cli/go/cmds/device.go
@@ -16,8 +16,8 @@ import (
 	"strings"
 	"time"
 
-	client "github.com/heketi/heketi/client/api/go-client"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/spf13/cobra"
 )
 
diff --git a/client/cli/go/cmds/heketi_storage.go b/client/cli/go/cmds/heketi_storage.go
index dd32ff3e63..037b32a621 100644
--- a/client/cli/go/cmds/heketi_storage.go
+++ b/client/cli/go/cmds/heketi_storage.go
@@ -16,9 +16,9 @@ import (
 	"os"
 	"strings"
 
-	client "github.com/heketi/heketi/client/api/go-client"
-	"github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	"github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/spf13/cobra"
 
 	batch "k8s.io/api/batch/v1"
diff --git a/client/cli/go/cmds/loglevel.go b/client/cli/go/cmds/loglevel.go
index 2d09d4481e..c1bd5fad0d 100644
--- a/client/cli/go/cmds/loglevel.go
+++ b/client/cli/go/cmds/loglevel.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 func init() {
diff --git a/client/cli/go/cmds/node.go b/client/cli/go/cmds/node.go
index 433aba1e49..edd0d76554 100644
--- a/client/cli/go/cmds/node.go
+++ b/client/cli/go/cmds/node.go
@@ -15,7 +15,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/spf13/cobra"
 )
 
diff --git a/client/cli/go/cmds/server.go b/client/cli/go/cmds/server.go
index cb17380f40..71cfdcb704 100644
--- a/client/cli/go/cmds/server.go
+++ b/client/cli/go/cmds/server.go
@@ -17,7 +17,7 @@ import (
 	"os"
 	"text/template"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 
 	"github.com/spf13/cobra"
 )
diff --git a/client/cli/go/cmds/topology.go b/client/cli/go/cmds/topology.go
index 7075b3d616..19ca9fc308 100644
--- a/client/cli/go/cmds/topology.go
+++ b/client/cli/go/cmds/topology.go
@@ -17,7 +17,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/spf13/cobra"
 )
 
diff --git a/client/cli/go/cmds/utils.go b/client/cli/go/cmds/utils.go
index 9a612f0336..1ae26b28d3 100644
--- a/client/cli/go/cmds/utils.go
+++ b/client/cli/go/cmds/utils.go
@@ -16,8 +16,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	client "github.com/heketi/heketi/client/api/go-client"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 func setTagsCommand(cmd *cobra.Command,
diff --git a/client/cli/go/cmds/volume.go b/client/cli/go/cmds/volume.go
index 16b69553f9..ecf073852b 100644
--- a/client/cli/go/cmds/volume.go
+++ b/client/cli/go/cmds/volume.go
@@ -17,8 +17,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/kubernetes"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/kubernetes"
 	"github.com/spf13/cobra"
 )
 
diff --git a/client/cli/go/main.go b/client/cli/go/main.go
index 1d67466518..4433d6409f 100644
--- a/client/cli/go/main.go
+++ b/client/cli/go/main.go
@@ -13,7 +13,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/heketi/heketi/client/cli/go/cmds"
+	"github.com/heketi/heketi/v10/client/cli/go/cmds"
 )
 
 var (
diff --git a/executors/cmdexec/block_volume.go b/executors/cmdexec/block_volume.go
index 0f3f767196..ea62841634 100644
--- a/executors/cmdexec/block_volume.go
+++ b/executors/cmdexec/block_volume.go
@@ -18,8 +18,8 @@ import (
 
 	"github.com/lpabon/godbc"
 
-	"github.com/heketi/heketi/executors"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/executors"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 func (s *CmdExecutor) BlockVolumeCreate(host string,
diff --git a/executors/cmdexec/brick.go b/executors/cmdexec/brick.go
index 45b675440b..9684b87d8c 100644
--- a/executors/cmdexec/brick.go
+++ b/executors/cmdexec/brick.go
@@ -14,10 +14,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/heketi/heketi/executors"
-	conv "github.com/heketi/heketi/pkg/conversions"
-	"github.com/heketi/heketi/pkg/paths"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/executors"
+	conv "github.com/heketi/heketi/v10/pkg/conversions"
+	"github.com/heketi/heketi/v10/pkg/paths"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 	"github.com/lpabon/godbc"
 )
 
diff --git a/executors/cmdexec/cmdexec.go b/executors/cmdexec/cmdexec.go
index 44f0df5d8f..04a7213cd6 100644
--- a/executors/cmdexec/cmdexec.go
+++ b/executors/cmdexec/cmdexec.go
@@ -16,8 +16,8 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/heketi/heketi/pkg/logging"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/pkg/logging"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 var (
diff --git a/executors/cmdexec/device.go b/executors/cmdexec/device.go
index 954fc787db..20d1d6a4e5 100644
--- a/executors/cmdexec/device.go
+++ b/executors/cmdexec/device.go
@@ -16,10 +16,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/heketi/heketi/executors"
-	conv "github.com/heketi/heketi/pkg/conversions"
-	"github.com/heketi/heketi/pkg/paths"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/executors"
+	conv "github.com/heketi/heketi/v10/pkg/conversions"
+	"github.com/heketi/heketi/v10/pkg/paths"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 const (
diff --git a/executors/cmdexec/peer.go b/executors/cmdexec/peer.go
index 8d57413d6d..9c51cf659e 100644
--- a/executors/cmdexec/peer.go
+++ b/executors/cmdexec/peer.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/lpabon/godbc"
 
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 // :TODO: Rename this function to NodeInit or something
diff --git a/executors/cmdexec/snapshot.go b/executors/cmdexec/snapshot.go
index 887854958d..347aa8720c 100644
--- a/executors/cmdexec/snapshot.go
+++ b/executors/cmdexec/snapshot.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/lpabon/godbc"
 
-	"github.com/heketi/heketi/executors"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/executors"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 func (s *CmdExecutor) snapshotActivate(host string, snapshot string) error {
diff --git a/executors/cmdexec/volume.go b/executors/cmdexec/volume.go
index 69e2bb0e15..dbcbf43103 100644
--- a/executors/cmdexec/volume.go
+++ b/executors/cmdexec/volume.go
@@ -16,9 +16,9 @@ import (
 
 	"github.com/lpabon/godbc"
 
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/pkg/idgen"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/pkg/idgen"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 func (s *CmdExecutor) VolumeCreate(host string,
diff --git a/executors/injectexec/hooks.go b/executors/injectexec/hooks.go
index 185adb3270..a86ab60b19 100644
--- a/executors/injectexec/hooks.go
+++ b/executors/injectexec/hooks.go
@@ -15,7 +15,7 @@ import (
 	"regexp"
 	"time"
 
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 // Reaction represents the type of result or error to produce when
diff --git a/executors/injectexec/injectexec.go b/executors/injectexec/injectexec.go
index 926ea6ead7..f955b3bb84 100644
--- a/executors/injectexec/injectexec.go
+++ b/executors/injectexec/injectexec.go
@@ -10,14 +10,14 @@
 package injectexec
 
 import (
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/executors/cmdexec"
-	"github.com/heketi/heketi/executors/kubeexec"
-	"github.com/heketi/heketi/executors/mockexec"
-	"github.com/heketi/heketi/executors/sshexec"
-	"github.com/heketi/heketi/executors/stack"
-	"github.com/heketi/heketi/pkg/logging"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/executors/cmdexec"
+	"github.com/heketi/heketi/v10/executors/kubeexec"
+	"github.com/heketi/heketi/v10/executors/mockexec"
+	"github.com/heketi/heketi/v10/executors/sshexec"
+	"github.com/heketi/heketi/v10/executors/stack"
+	"github.com/heketi/heketi/v10/pkg/logging"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 var (
diff --git a/executors/injectexec/mock_base.go b/executors/injectexec/mock_base.go
index 062e914c17..c5f987a913 100644
--- a/executors/injectexec/mock_base.go
+++ b/executors/injectexec/mock_base.go
@@ -10,8 +10,8 @@
 package injectexec
 
 import (
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/executors/mockexec"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/executors/mockexec"
 )
 
 var NotSupportedError = executors.NotSupportedError
diff --git a/executors/injectexec/transport.go b/executors/injectexec/transport.go
index 793387fb64..12446e25e2 100644
--- a/executors/injectexec/transport.go
+++ b/executors/injectexec/transport.go
@@ -10,8 +10,8 @@
 package injectexec
 
 import (
-	"github.com/heketi/heketi/executors/cmdexec"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/executors/cmdexec"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 // WrapCommandTransport can be used to replace a real transport
diff --git a/executors/kubeexec/config.go b/executors/kubeexec/config.go
index 6df36d3fd9..06175b15cc 100644
--- a/executors/kubeexec/config.go
+++ b/executors/kubeexec/config.go
@@ -10,7 +10,7 @@
 package kubeexec
 
 import (
-	"github.com/heketi/heketi/executors/cmdexec"
+	"github.com/heketi/heketi/v10/executors/cmdexec"
 )
 
 type KubeConfig struct {
diff --git a/executors/kubeexec/kubeexec.go b/executors/kubeexec/kubeexec.go
index 3de4b6e28b..892de03140 100644
--- a/executors/kubeexec/kubeexec.go
+++ b/executors/kubeexec/kubeexec.go
@@ -17,11 +17,11 @@ import (
 
 	"github.com/lpabon/godbc"
 
-	"github.com/heketi/heketi/executors/cmdexec"
-	"github.com/heketi/heketi/pkg/kubernetes"
-	"github.com/heketi/heketi/pkg/logging"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
-	"github.com/heketi/heketi/pkg/remoteexec/kube"
+	"github.com/heketi/heketi/v10/executors/cmdexec"
+	"github.com/heketi/heketi/v10/pkg/kubernetes"
+	"github.com/heketi/heketi/v10/pkg/logging"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/pkg/remoteexec/kube"
 )
 
 const (
diff --git a/executors/mockexec/mock.go b/executors/mockexec/mock.go
index d481bf0de0..1cfee96246 100644
--- a/executors/mockexec/mock.go
+++ b/executors/mockexec/mock.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/heketi/heketi/executors"
+	"github.com/heketi/heketi/v10/executors"
 )
 
 type MockExecutor struct {
diff --git a/executors/sshexec/config.go b/executors/sshexec/config.go
index 5815b81e17..23d811200b 100644
--- a/executors/sshexec/config.go
+++ b/executors/sshexec/config.go
@@ -10,7 +10,7 @@
 package sshexec
 
 import (
-	"github.com/heketi/heketi/executors/cmdexec"
+	"github.com/heketi/heketi/v10/executors/cmdexec"
 )
 
 type SshConfig struct {
diff --git a/executors/sshexec/sshexec.go b/executors/sshexec/sshexec.go
index 866b0c5ca1..cb6ab1c6da 100644
--- a/executors/sshexec/sshexec.go
+++ b/executors/sshexec/sshexec.go
@@ -17,10 +17,10 @@ import (
 
 	"github.com/lpabon/godbc"
 
-	"github.com/heketi/heketi/executors/cmdexec"
-	"github.com/heketi/heketi/pkg/logging"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
-	"github.com/heketi/heketi/pkg/remoteexec/ssh"
+	"github.com/heketi/heketi/v10/executors/cmdexec"
+	"github.com/heketi/heketi/v10/pkg/logging"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/pkg/remoteexec/ssh"
 )
 
 type Ssher interface {
diff --git a/executors/stack/stack.go b/executors/stack/stack.go
index b4107031f8..4b06220d8c 100644
--- a/executors/stack/stack.go
+++ b/executors/stack/stack.go
@@ -10,7 +10,7 @@
 package stack
 
 import (
-	"github.com/heketi/heketi/executors"
+	"github.com/heketi/heketi/v10/executors"
 )
 
 var (
diff --git a/go.mod b/go.mod
index ae95c9a994..0299757737 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/heketi/heketi
+module github.com/heketi/heketi/v10
 
 go 1.14
 
diff --git a/main.go b/main.go
index b941980639..e81300202e 100644
--- a/main.go
+++ b/main.go
@@ -27,12 +27,12 @@ import (
 	"github.com/urfave/negroni"
 	restclient "k8s.io/client-go/rest"
 
-	"github.com/heketi/heketi/apps/glusterfs"
-	"github.com/heketi/heketi/middleware"
-	"github.com/heketi/heketi/pkg/metrics"
-	"github.com/heketi/heketi/server/admin"
-	"github.com/heketi/heketi/server/config"
-	"github.com/heketi/heketi/server/profiling"
+	"github.com/heketi/heketi/v10/apps/glusterfs"
+	"github.com/heketi/heketi/v10/middleware"
+	"github.com/heketi/heketi/v10/pkg/metrics"
+	"github.com/heketi/heketi/v10/server/admin"
+	"github.com/heketi/heketi/v10/server/config"
+	"github.com/heketi/heketi/v10/server/profiling"
 )
 
 var (
diff --git a/middleware/jwt.go b/middleware/jwt.go
index 6b1cf3b9d0..3053a9a299 100644
--- a/middleware/jwt.go
+++ b/middleware/jwt.go
@@ -23,7 +23,7 @@ import (
 
 	jwtmiddleware "github.com/auth0/go-jwt-middleware"
 	jwt "github.com/golang-jwt/jwt"
-	"github.com/heketi/heketi/pkg/logging"
+	"github.com/heketi/heketi/v10/pkg/logging"
 )
 
 var (
diff --git a/pkg/glusterfs/api/types.go b/pkg/glusterfs/api/types.go
index a1381b48c8..3097fa1b0e 100644
--- a/pkg/glusterfs/api/types.go
+++ b/pkg/glusterfs/api/types.go
@@ -11,7 +11,7 @@
 //
 
 //
-// Please see https://github.com/heketi/heketi/wiki/API
+// Please see https://github.com/heketi/heketi/v10/wiki/API
 // for documentation
 //
 package api
diff --git a/pkg/kubernetes/backupdb.go b/pkg/kubernetes/backupdb.go
index 626aadcae8..e3fa4c3614 100644
--- a/pkg/kubernetes/backupdb.go
+++ b/pkg/kubernetes/backupdb.go
@@ -16,7 +16,7 @@ import (
 	"os"
 
 	"github.com/boltdb/bolt"
-	wdb "github.com/heketi/heketi/pkg/db"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
 
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
diff --git a/pkg/kubernetes/pv.go b/pkg/kubernetes/pv.go
index a12e39945a..a333bf1127 100644
--- a/pkg/kubernetes/pv.go
+++ b/pkg/kubernetes/pv.go
@@ -12,7 +12,7 @@ package kubernetes
 import (
 	"fmt"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 
 	kubeapi "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
diff --git a/pkg/logging/log.go b/pkg/logging/log.go
index 9fb789a37a..0420fb2709 100644
--- a/pkg/logging/log.go
+++ b/pkg/logging/log.go
@@ -49,7 +49,7 @@ func logWithLongFile(l *log.Logger, format string, v ...interface{}) {
 
 	// Shorten the path.
 	// From
-	// /builddir/build/BUILD/heketi-3f4a5b1b6edff87232e8b24533c53b4151ebd9c7/src/github.com/heketi/heketi/apps/glusterfs/volume_entry.go
+	// /builddir/build/BUILD/heketi-3f4a5b1b6edff87232e8b24533c53b4151ebd9c7/src/github.com/heketi/heketi/v10/apps/glusterfs/volume_entry.go
 	// to
 	// apps/glusterfs/volume_entry.go
 	const basePath = "github.com/heketi/"
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
index a6d39baedd..43e364f643 100644
--- a/pkg/metrics/metrics.go
+++ b/pkg/metrics/metrics.go
@@ -13,7 +13,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/heketi/heketi/apps"
+	"github.com/heketi/heketi/v10/apps"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
diff --git a/pkg/remoteexec/kube/exec.go b/pkg/remoteexec/kube/exec.go
index 4843714280..93a99b4db9 100644
--- a/pkg/remoteexec/kube/exec.go
+++ b/pkg/remoteexec/kube/exec.go
@@ -20,8 +20,8 @@ import (
 	"k8s.io/client-go/tools/remotecommand"
 	"k8s.io/client-go/util/exec"
 
-	rex "github.com/heketi/heketi/pkg/remoteexec"
-	rexlog "github.com/heketi/heketi/pkg/remoteexec/log"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
+	rexlog "github.com/heketi/heketi/v10/pkg/remoteexec/log"
 )
 
 type TimeoutOptions struct {
diff --git a/pkg/remoteexec/kube/target.go b/pkg/remoteexec/kube/target.go
index db22f429e5..e94ce3d080 100644
--- a/pkg/remoteexec/kube/target.go
+++ b/pkg/remoteexec/kube/target.go
@@ -15,7 +15,7 @@ import (
 
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/heketi/heketi/pkg/kubernetes"
+	"github.com/heketi/heketi/v10/pkg/kubernetes"
 )
 
 type describable interface {
diff --git a/pkg/remoteexec/log/commandlog.go b/pkg/remoteexec/log/commandlog.go
index e398e352c4..39902bfb41 100644
--- a/pkg/remoteexec/log/commandlog.go
+++ b/pkg/remoteexec/log/commandlog.go
@@ -10,7 +10,7 @@
 package log
 
 import (
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 // Logger interface exists to allow the library to use a
diff --git a/pkg/remoteexec/ssh/ssh.go b/pkg/remoteexec/ssh/ssh.go
index 7f1a26aafb..0e610ec6b7 100644
--- a/pkg/remoteexec/ssh/ssh.go
+++ b/pkg/remoteexec/ssh/ssh.go
@@ -24,9 +24,9 @@ import (
 	"golang.org/x/crypto/ssh/agent"
 	"golang.org/x/crypto/ssh/knownhosts"
 
-	"github.com/heketi/heketi/pkg/logging"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
-	rexlog "github.com/heketi/heketi/pkg/remoteexec/log"
+	"github.com/heketi/heketi/v10/pkg/logging"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
+	rexlog "github.com/heketi/heketi/v10/pkg/remoteexec/log"
 )
 
 type SshExec struct {
diff --git a/server/admin/http.go b/server/admin/http.go
index 1b7834a825..e959fae053 100644
--- a/server/admin/http.go
+++ b/server/admin/http.go
@@ -17,8 +17,8 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 )
 
 var (
diff --git a/server/admin/reset.go b/server/admin/reset.go
index 0281ba6f92..2a5d0f7d84 100644
--- a/server/admin/reset.go
+++ b/server/admin/reset.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 func ResetStateOnSignal(s *ServerState, sig ...os.Signal) {
diff --git a/server/admin/state.go b/server/admin/state.go
index 8885a07eb9..575eb26a1d 100644
--- a/server/admin/state.go
+++ b/server/admin/state.go
@@ -13,7 +13,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 type ServerState struct {
diff --git a/server/config/config.go b/server/config/config.go
index 1544fa5fc2..72e2f2e4ed 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -15,8 +15,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/heketi/heketi/apps/glusterfs"
-	"github.com/heketi/heketi/middleware"
+	"github.com/heketi/heketi/v10/apps/glusterfs"
+	"github.com/heketi/heketi/v10/middleware"
 )
 
 type Config struct {
diff --git a/server/rest/asynchttp.go b/server/rest/asynchttp.go
index a228774e73..5b03313984 100644
--- a/server/rest/asynchttp.go
+++ b/server/rest/asynchttp.go
@@ -15,8 +15,8 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/heketi/heketi/pkg/idgen"
-	"github.com/heketi/heketi/pkg/logging"
+	"github.com/heketi/heketi/v10/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/logging"
 	"github.com/lpabon/godbc"
 )
 


Test patch:
diff --git a/apps/glusterfs/allocator_simple_ring_test.go b/apps/glusterfs/allocator_simple_ring_test.go
index e649e2eb95..03d7abdc44 100644
--- a/apps/glusterfs/allocator_simple_ring_test.go
+++ b/apps/glusterfs/allocator_simple_ring_test.go
@@ -13,7 +13,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/heketi/heketi/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/idgen"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/app_block_volume_test.go b/apps/glusterfs/app_block_volume_test.go
index 9c8171949b..e43415bafa 100644
--- a/apps/glusterfs/app_block_volume_test.go
+++ b/apps/glusterfs/app_block_volume_test.go
@@ -25,8 +25,8 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/gorilla/mux"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/app_cluster_test.go b/apps/glusterfs/app_cluster_test.go
index 53457fa276..099000f92e 100644
--- a/apps/glusterfs/app_cluster_test.go
+++ b/apps/glusterfs/app_cluster_test.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/gorilla/mux"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/app_device_test.go b/apps/glusterfs/app_device_test.go
index 91a1dd2908..e34e07245e 100644
--- a/apps/glusterfs/app_device_test.go
+++ b/apps/glusterfs/app_device_test.go
@@ -20,12 +20,12 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/gorilla/mux"
-	client "github.com/heketi/heketi/client/api/go-client"
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
-	"github.com/heketi/heketi/pkg/sortedstrings"
-	"github.com/heketi/heketi/pkg/utils"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/sortedstrings"
+	"github.com/heketi/heketi/v10/pkg/utils"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/app_logging_test.go b/apps/glusterfs/app_logging_test.go
index 28d3a420d7..aa0176e522 100644
--- a/apps/glusterfs/app_logging_test.go
+++ b/apps/glusterfs/app_logging_test.go
@@ -19,9 +19,9 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/logging"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/logging"
+	"github.com/heketi/heketi/v10/pkg/utils"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/app_middleware_test.go b/apps/glusterfs/app_middleware_test.go
index c77cc33f9b..9ce8d0db89 100644
--- a/apps/glusterfs/app_middleware_test.go
+++ b/apps/glusterfs/app_middleware_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	//"github.com/boltdb/bolt"
-	wdb "github.com/heketi/heketi/pkg/db"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/app_node_test.go b/apps/glusterfs/app_node_test.go
index 72b1c5d812..c9954ef2bd 100644
--- a/apps/glusterfs/app_node_test.go
+++ b/apps/glusterfs/app_node_test.go
@@ -22,11 +22,11 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/gorilla/mux"
-	client "github.com/heketi/heketi/client/api/go-client"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
-	"github.com/heketi/heketi/pkg/sortedstrings"
-	"github.com/heketi/heketi/pkg/utils"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/sortedstrings"
+	"github.com/heketi/heketi/v10/pkg/utils"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/app_test.go b/apps/glusterfs/app_test.go
index 380d608bf3..7a36f83961 100644
--- a/apps/glusterfs/app_test.go
+++ b/apps/glusterfs/app_test.go
@@ -17,8 +17,8 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/gorilla/mux"
-	client "github.com/heketi/heketi/client/api/go-client"
-	"github.com/heketi/heketi/pkg/logging"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	"github.com/heketi/heketi/v10/pkg/logging"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/app_volume_test.go b/apps/glusterfs/app_volume_test.go
index d6bd27bbcb..1801c3ee83 100644
--- a/apps/glusterfs/app_volume_test.go
+++ b/apps/glusterfs/app_volume_test.go
@@ -27,11 +27,11 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/gorilla/mux"
-	client "github.com/heketi/heketi/client/api/go-client"
-	"github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/sortedstrings"
-	"github.com/heketi/heketi/pkg/utils"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	"github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/sortedstrings"
+	"github.com/heketi/heketi/v10/pkg/utils"
 	"github.com/heketi/tests"
 )
 
@@ -1194,7 +1194,7 @@ func TestVolumeClusterResizeByAddingDevices(t *testing.T) {
 	tests.Assert(t, err == ErrNoSpace)
 }
 
-// Test for https://github.com/heketi/heketi/issues/382:
+// Test for https://github.com/heketi/heketi/v10/issues/382:
 //
 // A TopologyInfo request running concurrently to a
 // VolumeCreate request failed with "Id not found" due
diff --git a/apps/glusterfs/block_volume_entry_test.go b/apps/glusterfs/block_volume_entry_test.go
index 537c17c3fa..8841791658 100644
--- a/apps/glusterfs/block_volume_entry_test.go
+++ b/apps/glusterfs/block_volume_entry_test.go
@@ -15,7 +15,7 @@ import (
 	"testing"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/block_volume_expand_test.go b/apps/glusterfs/block_volume_expand_test.go
index 06b688dec1..0a31fd11e7 100644
--- a/apps/glusterfs/block_volume_expand_test.go
+++ b/apps/glusterfs/block_volume_expand_test.go
@@ -14,10 +14,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/executors"
+	"github.com/heketi/heketi/v10/executors"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/brick_allocate_test.go b/apps/glusterfs/brick_allocate_test.go
index b2c8184b96..eb23a2c926 100644
--- a/apps/glusterfs/brick_allocate_test.go
+++ b/apps/glusterfs/brick_allocate_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/boltdb/bolt"
 	"github.com/heketi/tests"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 func TestClusterDeviceSource(t *testing.T) {
diff --git a/apps/glusterfs/brick_entry_test.go b/apps/glusterfs/brick_entry_test.go
index a3d4b296ed..bececacd93 100644
--- a/apps/glusterfs/brick_entry_test.go
+++ b/apps/glusterfs/brick_entry_test.go
@@ -15,8 +15,8 @@ import (
 	"testing"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/cluster_entry_test.go b/apps/glusterfs/cluster_entry_test.go
index 4d09096eaa..adba7a2a36 100644
--- a/apps/glusterfs/cluster_entry_test.go
+++ b/apps/glusterfs/cluster_entry_test.go
@@ -15,8 +15,8 @@ import (
 	"testing"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/sortedstrings"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/sortedstrings"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/db_operations_test.go b/apps/glusterfs/db_operations_test.go
index 8398de9625..e4cf16e9a1 100644
--- a/apps/glusterfs/db_operations_test.go
+++ b/apps/glusterfs/db_operations_test.go
@@ -14,8 +14,8 @@ import (
 	"testing"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/dbcommon_test.go b/apps/glusterfs/dbcommon_test.go
index f3a1138a7d..a708ce3afa 100644
--- a/apps/glusterfs/dbcommon_test.go
+++ b/apps/glusterfs/dbcommon_test.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 
 	"github.com/boltdb/bolt"
 	"github.com/heketi/tests"
diff --git a/apps/glusterfs/device_entry_test.go b/apps/glusterfs/device_entry_test.go
index 9ef0489349..20ddb8c99f 100644
--- a/apps/glusterfs/device_entry_test.go
+++ b/apps/glusterfs/device_entry_test.go
@@ -17,10 +17,10 @@ import (
 	"testing"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
-	"github.com/heketi/heketi/pkg/sortedstrings"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/sortedstrings"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/entry_test.go b/apps/glusterfs/entry_test.go
index 236ee2c896..34806489a5 100644
--- a/apps/glusterfs/entry_test.go
+++ b/apps/glusterfs/entry_test.go
@@ -12,7 +12,7 @@ package glusterfs
 import (
 	"testing"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/health_cache_test.go b/apps/glusterfs/health_cache_test.go
index a4ca314370..a8ae7d1615 100644
--- a/apps/glusterfs/health_cache_test.go
+++ b/apps/glusterfs/health_cache_test.go
@@ -18,8 +18,8 @@ import (
 	"github.com/boltdb/bolt"
 	"github.com/heketi/tests"
 
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 func TestCreateNodeHeathCache(t *testing.T) {
diff --git a/apps/glusterfs/listing_test.go b/apps/glusterfs/listing_test.go
index c5622b3f81..7cc9a4fda2 100644
--- a/apps/glusterfs/listing_test.go
+++ b/apps/glusterfs/listing_test.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 
 	"github.com/boltdb/bolt"
 	"github.com/heketi/tests"
diff --git a/apps/glusterfs/node_entry_test.go b/apps/glusterfs/node_entry_test.go
index b1cf048527..65e3252da0 100644
--- a/apps/glusterfs/node_entry_test.go
+++ b/apps/glusterfs/node_entry_test.go
@@ -15,9 +15,9 @@ import (
 	"testing"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
-	"github.com/heketi/heketi/pkg/sortedstrings"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/sortedstrings"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/operations_block_restriction_test.go b/apps/glusterfs/operations_block_restriction_test.go
index 19e239b905..f8226ce912 100644
--- a/apps/glusterfs/operations_block_restriction_test.go
+++ b/apps/glusterfs/operations_block_restriction_test.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 
 	"github.com/boltdb/bolt"
 	"github.com/heketi/tests"
diff --git a/apps/glusterfs/operations_block_volume_test.go b/apps/glusterfs/operations_block_volume_test.go
index 8e1b14dcdc..3541648ad7 100644
--- a/apps/glusterfs/operations_block_volume_test.go
+++ b/apps/glusterfs/operations_block_volume_test.go
@@ -14,8 +14,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 
 	"github.com/boltdb/bolt"
 	"github.com/heketi/tests"
diff --git a/apps/glusterfs/operations_cleanup_test.go b/apps/glusterfs/operations_cleanup_test.go
index 87d9d72f9c..5b3d2ecc4f 100644
--- a/apps/glusterfs/operations_cleanup_test.go
+++ b/apps/glusterfs/operations_cleanup_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/boltdb/bolt"
 	"github.com/heketi/tests"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 func TestBasicOperationsCleanup(t *testing.T) {
diff --git a/apps/glusterfs/operations_device_test.go b/apps/glusterfs/operations_device_test.go
index d9ddb85ef4..f9ec486965 100644
--- a/apps/glusterfs/operations_device_test.go
+++ b/apps/glusterfs/operations_device_test.go
@@ -15,8 +15,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 
 	"github.com/boltdb/bolt"
 	"github.com/heketi/tests"
diff --git a/apps/glusterfs/operations_load_test.go b/apps/glusterfs/operations_load_test.go
index 6bbd247340..0c74b44b18 100644
--- a/apps/glusterfs/operations_load_test.go
+++ b/apps/glusterfs/operations_load_test.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/heketi/tests"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 func TestLoadOperation(t *testing.T) {
diff --git a/apps/glusterfs/operations_manage_test.go b/apps/glusterfs/operations_manage_test.go
index d075be3609..f4cc3523ce 100644
--- a/apps/glusterfs/operations_manage_test.go
+++ b/apps/glusterfs/operations_manage_test.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/heketi/tests"
 
-	"github.com/heketi/heketi/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/idgen"
 )
 
 func TestOpTrackerCounts(t *testing.T) {
diff --git a/apps/glusterfs/operations_test.go b/apps/glusterfs/operations_test.go
index 2f8cd22751..930751cd0c 100644
--- a/apps/glusterfs/operations_test.go
+++ b/apps/glusterfs/operations_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 
 	"github.com/boltdb/bolt"
 	"github.com/heketi/tests"
diff --git a/apps/glusterfs/operations_volume_test.go b/apps/glusterfs/operations_volume_test.go
index 1f1cd34386..55a2be1c8d 100644
--- a/apps/glusterfs/operations_volume_test.go
+++ b/apps/glusterfs/operations_volume_test.go
@@ -16,8 +16,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 
 	"github.com/boltdb/bolt"
 	"github.com/heketi/tests"
diff --git a/apps/glusterfs/tags_test.go b/apps/glusterfs/tags_test.go
index 46e6ef5035..84a2e71e28 100644
--- a/apps/glusterfs/tags_test.go
+++ b/apps/glusterfs/tags_test.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/heketi/tests"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 type testTaggable struct {
diff --git a/apps/glusterfs/volume_durability_test.go b/apps/glusterfs/volume_durability_test.go
index a8f12a470e..328a2d84b5 100644
--- a/apps/glusterfs/volume_durability_test.go
+++ b/apps/glusterfs/volume_durability_test.go
@@ -12,7 +12,7 @@ package glusterfs
 import (
 	"testing"
 
-	"github.com/heketi/heketi/executors"
+	"github.com/heketi/heketi/v10/executors"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/volume_entry_test.go b/apps/glusterfs/volume_entry_test.go
index e7dab72b51..222becc17a 100644
--- a/apps/glusterfs/volume_entry_test.go
+++ b/apps/glusterfs/volume_entry_test.go
@@ -20,11 +20,11 @@ import (
 	"testing"
 
 	"github.com/boltdb/bolt"
-	"github.com/heketi/heketi/executors"
-	wdb "github.com/heketi/heketi/pkg/db"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/sortedstrings"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/executors"
+	wdb "github.com/heketi/heketi/v10/pkg/db"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/sortedstrings"
+	"github.com/heketi/heketi/v10/pkg/utils"
 	"github.com/heketi/tests"
 )
 
diff --git a/apps/glusterfs/zone_filter_test.go b/apps/glusterfs/zone_filter_test.go
index 7643bdce3a..704c581f60 100644
--- a/apps/glusterfs/zone_filter_test.go
+++ b/apps/glusterfs/zone_filter_test.go
@@ -16,7 +16,7 @@ import (
 	_ "github.com/boltdb/bolt"
 	"github.com/heketi/tests"
 
-	_ "github.com/heketi/heketi/pkg/db"
+	_ "github.com/heketi/heketi/v10/pkg/db"
 )
 
 func TestNewDeviceZoneMap(t *testing.T) {
diff --git a/client/api/go-client/client_test.go b/client/api/go-client/client_test.go
index 44f519637a..85590ffd7c 100644
--- a/client/api/go-client/client_test.go
+++ b/client/api/go-client/client_test.go
@@ -22,12 +22,12 @@ import (
 	"testing"
 
 	"github.com/gorilla/mux"
-	"github.com/heketi/heketi/apps/glusterfs"
-	"github.com/heketi/heketi/middleware"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/idgen"
-	"github.com/heketi/heketi/pkg/utils"
-	"github.com/heketi/heketi/server/admin"
+	"github.com/heketi/heketi/v10/apps/glusterfs"
+	"github.com/heketi/heketi/v10/middleware"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/idgen"
+	"github.com/heketi/heketi/v10/pkg/utils"
+	"github.com/heketi/heketi/v10/server/admin"
 	"github.com/heketi/tests"
 	"github.com/urfave/negroni"
 )
diff --git a/executors/cmdexec/brick_test.go b/executors/cmdexec/brick_test.go
index 13f901ae67..9b1bc18a66 100644
--- a/executors/cmdexec/brick_test.go
+++ b/executors/cmdexec/brick_test.go
@@ -13,10 +13,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/heketi/heketi/executors"
-	conv "github.com/heketi/heketi/pkg/conversions"
-	"github.com/heketi/heketi/pkg/paths"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/executors"
+	conv "github.com/heketi/heketi/v10/pkg/conversions"
+	"github.com/heketi/heketi/v10/pkg/paths"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 	"github.com/heketi/tests"
 )
 
diff --git a/executors/cmdexec/device_test.go b/executors/cmdexec/device_test.go
index f2bcf025fb..b43282cfb1 100644
--- a/executors/cmdexec/device_test.go
+++ b/executors/cmdexec/device_test.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/heketi/tests"
 
-	"github.com/heketi/heketi/executors"
+	"github.com/heketi/heketi/v10/executors"
 )
 
 func TestCheckHandle(t *testing.T) {
diff --git a/executors/cmdexec/fakeexec_test.go b/executors/cmdexec/fakeexec_test.go
index 05f72d1f1c..41c94b217e 100644
--- a/executors/cmdexec/fakeexec_test.go
+++ b/executors/cmdexec/fakeexec_test.go
@@ -10,7 +10,7 @@
 package cmdexec
 
 import (
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 type CommandFaker struct {
diff --git a/executors/cmdexec/peer_test.go b/executors/cmdexec/peer_test.go
index a77623f412..f2c5a460e6 100644
--- a/executors/cmdexec/peer_test.go
+++ b/executors/cmdexec/peer_test.go
@@ -12,7 +12,7 @@ package cmdexec
 import (
 	"testing"
 
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 	"github.com/heketi/tests"
 )
 
diff --git a/executors/injectexec/hooks_test.go b/executors/injectexec/hooks_test.go
index 73c154d088..7a3bbf4f8c 100644
--- a/executors/injectexec/hooks_test.go
+++ b/executors/injectexec/hooks_test.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/heketi/tests"
 
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 func TestCmdHookString(t *testing.T) {
diff --git a/executors/injectexec/injectexec_test.go b/executors/injectexec/injectexec_test.go
index 69bd422a3e..7519fcfea9 100644
--- a/executors/injectexec/injectexec_test.go
+++ b/executors/injectexec/injectexec_test.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/heketi/tests"
 
-	"github.com/heketi/heketi/executors/cmdexec"
-	"github.com/heketi/heketi/executors/mockexec"
+	"github.com/heketi/heketi/v10/executors/cmdexec"
+	"github.com/heketi/heketi/v10/executors/mockexec"
 )
 
 func TestBasicWrapping(t *testing.T) {
diff --git a/executors/injectexec/transport_test.go b/executors/injectexec/transport_test.go
index 21656f4a21..6e9ca7e132 100644
--- a/executors/injectexec/transport_test.go
+++ b/executors/injectexec/transport_test.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/heketi/tests"
 
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 type DummyTransport struct {
diff --git a/executors/kubeexec/kubeexec_test.go b/executors/kubeexec/kubeexec_test.go
index 0157639d08..ace69658d5 100644
--- a/executors/kubeexec/kubeexec_test.go
+++ b/executors/kubeexec/kubeexec_test.go
@@ -15,8 +15,8 @@ import (
 
 	restclient "k8s.io/client-go/rest"
 
-	"github.com/heketi/heketi/executors/cmdexec"
-	"github.com/heketi/heketi/pkg/remoteexec/kube"
+	"github.com/heketi/heketi/v10/executors/cmdexec"
+	"github.com/heketi/heketi/v10/pkg/remoteexec/kube"
 	"github.com/heketi/tests"
 )
 
diff --git a/executors/sshexec/sshexec_test.go b/executors/sshexec/sshexec_test.go
index 4b8b90af8e..64fc487c29 100644
--- a/executors/sshexec/sshexec_test.go
+++ b/executors/sshexec/sshexec_test.go
@@ -13,9 +13,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/heketi/heketi/executors/cmdexec"
-	"github.com/heketi/heketi/pkg/logging"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/executors/cmdexec"
+	"github.com/heketi/heketi/v10/pkg/logging"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 	"github.com/heketi/tests"
 )
 
diff --git a/executors/stack/stack_test.go b/executors/stack/stack_test.go
index 3084dda82c..d76bdee943 100644
--- a/executors/stack/stack_test.go
+++ b/executors/stack/stack_test.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/heketi/tests"
 
-	"github.com/heketi/heketi/executors"
-	"github.com/heketi/heketi/executors/mockexec"
+	"github.com/heketi/heketi/v10/executors"
+	"github.com/heketi/heketi/v10/executors/mockexec"
 )
 
 func TestNewExecutorStack(t *testing.T) {
diff --git a/middleware/jwt_test.go b/middleware/jwt_test.go
index 88e1a5f51b..6b9cf502d4 100644
--- a/middleware/jwt_test.go
+++ b/middleware/jwt_test.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	jwt "github.com/golang-jwt/jwt"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/utils"
 	"github.com/heketi/tests"
 	"github.com/urfave/negroni"
 )
diff --git a/pkg/heketitest/heketitest.go b/pkg/heketitest/heketitest.go
index 7a96f1b9ba..7e849c3bee 100644
--- a/pkg/heketitest/heketitest.go
+++ b/pkg/heketitest/heketitest.go
@@ -14,8 +14,8 @@ import (
 	"os"
 
 	"github.com/gorilla/mux"
-	"github.com/heketi/heketi/apps/glusterfs"
-	"github.com/heketi/heketi/middleware"
+	"github.com/heketi/heketi/v10/apps/glusterfs"
+	"github.com/heketi/heketi/v10/middleware"
 	"github.com/heketi/tests"
 	"github.com/lpabon/godbc"
 	"github.com/urfave/negroni"
diff --git a/pkg/heketitest/heketitest_test.go b/pkg/heketitest/heketitest_test.go
index 95d7aca647..546225bf8c 100644
--- a/pkg/heketitest/heketitest_test.go
+++ b/pkg/heketitest/heketitest_test.go
@@ -12,8 +12,8 @@ package heketitest
 import (
 	"testing"
 
-	client "github.com/heketi/heketi/client/api/go-client"
-	glusterapi "github.com/heketi/heketi/pkg/glusterfs/api"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	glusterapi "github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/heketi/tests"
 )
 
diff --git a/pkg/logging/log_test.go b/pkg/logging/log_test.go
index b675c22c7c..57e8834f9a 100644
--- a/pkg/logging/log_test.go
+++ b/pkg/logging/log_test.go
@@ -63,7 +63,7 @@ func TestLogDebug(t *testing.T) {
 	tests.Assert(t, strings.Contains(testbuffer.String(), "Hello World"), testbuffer.String())
 	tests.Assert(t, strings.Contains(testbuffer.String(), "log_test.go"), testbuffer.String())
 
-	// [testing] DEBUG 2016/04/28 15:25:08 /src/github.com/heketi/heketi/pkg/utils/log_test.go:66: Hello World
+	// [testing] DEBUG 2016/04/28 15:25:08 /src/github.com/heketi/heketi/v10/pkg/utils/log_test.go:66: Hello World
 	fileinfo := strings.Split(testbuffer.String(), " ")[4]
 	filename := strings.Split(fileinfo, ":")[0]
 
diff --git a/pkg/metrics/metrics_test.go b/pkg/metrics/metrics_test.go
index bfdbe09d3d..52ac455932 100644
--- a/pkg/metrics/metrics_test.go
+++ b/pkg/metrics/metrics_test.go
@@ -17,7 +17,7 @@ import (
 	"testing"
 
 	"github.com/gorilla/mux"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 )
 
 type testApp struct {
diff --git a/pkg/remoteexec/kube/exec_test.go b/pkg/remoteexec/kube/exec_test.go
index 7a9111ba88..5d30bb469b 100644
--- a/pkg/remoteexec/kube/exec_test.go
+++ b/pkg/remoteexec/kube/exec_test.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/heketi/tests"
 
-	rex "github.com/heketi/heketi/pkg/remoteexec"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
 )
 
 // test timeout options
diff --git a/pkg/testutils/cluster.go b/pkg/testutils/cluster.go
index 9a192bfc50..a5a550abcc 100644
--- a/pkg/testutils/cluster.go
+++ b/pkg/testutils/cluster.go
@@ -19,9 +19,9 @@ import (
 	"os"
 	"testing"
 
-	client "github.com/heketi/heketi/client/api/go-client"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 
 	"github.com/heketi/tests"
 )
diff --git a/pkg/testutils/nodes.go b/pkg/testutils/nodes.go
index 4acd1c9443..70cf8669a9 100644
--- a/pkg/testutils/nodes.go
+++ b/pkg/testutils/nodes.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -18,8 +19,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/heketi/heketi/pkg/logging"
-	"github.com/heketi/heketi/pkg/remoteexec/ssh"
+	"github.com/heketi/heketi/v10/pkg/logging"
+	"github.com/heketi/heketi/v10/pkg/remoteexec/ssh"
 )
 
 var (
diff --git a/tests/100-compile-functest-go.sh b/tests/100-compile-functest-go.sh
index a1683adfc5..b35030f420 100755
--- a/tests/100-compile-functest-go.sh
+++ b/tests/100-compile-functest-go.sh
@@ -3,5 +3,5 @@
 TAGS="functional dbexamples"
 find tests/functional -name '*.go' -print0 | \
 	xargs -0 dirname | sort -u | \
-	sed -e 's,^/*,github.com/heketi/heketi/,' | \
+	sed -e 's,^/*,github.com/heketi/heketi/v10/,' | \
 	xargs -L1 go test -c -o /dev/null -tags "$TAGS"
diff --git a/tests/functional/TestDbExportImport/dbexamples_test.go b/tests/functional/TestDbExportImport/dbexamples_test.go
index 99cf92e576..2f1031489c 100644
--- a/tests/functional/TestDbExportImport/dbexamples_test.go
+++ b/tests/functional/TestDbExportImport/dbexamples_test.go
@@ -1,3 +1,4 @@
+//go:build dbexamples
 // +build dbexamples
 
 //
@@ -16,8 +17,8 @@ import (
 	"testing"
 
 	//"github.com/boltdb/bolt"
-	g "github.com/heketi/heketi/apps/glusterfs"
-	//"github.com/heketi/heketi/pkg/glusterfs/api"
+	g "github.com/heketi/heketi/v10/apps/glusterfs"
+	//"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	//"github.com/heketi/tests"
 )
 
diff --git a/tests/functional/TestEnabledTLS/client_tls_test/client_tls_test.go b/tests/functional/TestEnabledTLS/client_tls_test/client_tls_test.go
index d207c5cabc..afa7583893 100644
--- a/tests/functional/TestEnabledTLS/client_tls_test/client_tls_test.go
+++ b/tests/functional/TestEnabledTLS/client_tls_test/client_tls_test.go
@@ -18,9 +18,9 @@ import (
 	"testing"
 	"time"
 
-	client "github.com/heketi/heketi/client/api/go-client"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	tutils "github.com/heketi/heketi/pkg/testutils"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	tutils "github.com/heketi/heketi/v10/pkg/testutils"
 
 	"github.com/heketi/tests"
 )
diff --git a/tests/functional/TestErrorHandling/tests/background_cleanup_test.go b/tests/functional/TestErrorHandling/tests/background_cleanup_test.go
index 05b1dae8f4..04445843f1 100644
--- a/tests/functional/TestErrorHandling/tests/background_cleanup_test.go
+++ b/tests/functional/TestErrorHandling/tests/background_cleanup_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -22,10 +23,10 @@ import (
 
 	"github.com/heketi/tests"
 
-	inj "github.com/heketi/heketi/executors/injectexec"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	inj "github.com/heketi/heketi/v10/executors/injectexec"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 )
 
 func TestCleanupAfterRestart(t *testing.T) {
diff --git a/tests/functional/TestErrorHandling/tests/block_expand_test.go b/tests/functional/TestErrorHandling/tests/block_expand_test.go
index df957659a8..0d89a0aadc 100644
--- a/tests/functional/TestErrorHandling/tests/block_expand_test.go
+++ b/tests/functional/TestErrorHandling/tests/block_expand_test.go
@@ -22,10 +22,10 @@ import (
 
 	"github.com/heketi/tests"
 
-	inj "github.com/heketi/heketi/executors/injectexec"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	inj "github.com/heketi/heketi/v10/executors/injectexec"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 )
 
 func TestBlockExpandInject(t *testing.T) {
diff --git a/tests/functional/TestErrorHandling/tests/brick_evict_test.go b/tests/functional/TestErrorHandling/tests/brick_evict_test.go
index 28836bf2da..28658c29e7 100644
--- a/tests/functional/TestErrorHandling/tests/brick_evict_test.go
+++ b/tests/functional/TestErrorHandling/tests/brick_evict_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -24,12 +25,12 @@ import (
 
 	"github.com/heketi/tests"
 
-	inj "github.com/heketi/heketi/executors/injectexec"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
-	"github.com/heketi/heketi/pkg/remoteexec/ssh"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	inj "github.com/heketi/heketi/v10/executors/injectexec"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/pkg/remoteexec/ssh"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 )
 
 func TestBrickEvict(t *testing.T) {
diff --git a/tests/functional/TestErrorHandling/tests/common_test.go b/tests/functional/TestErrorHandling/tests/common_test.go
index 3e361eb706..c905b7a2cd 100644
--- a/tests/functional/TestErrorHandling/tests/common_test.go
+++ b/tests/functional/TestErrorHandling/tests/common_test.go
@@ -19,9 +19,9 @@ import (
 	"io"
 	"os"
 
-	"github.com/heketi/heketi/pkg/logging"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	"github.com/heketi/heketi/v10/pkg/logging"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 )
 
 var (
diff --git a/tests/functional/TestErrorHandling/tests/db_contents_test.go b/tests/functional/TestErrorHandling/tests/db_contents_test.go
index 23bc806bcb..871fdbe545 100644
--- a/tests/functional/TestErrorHandling/tests/db_contents_test.go
+++ b/tests/functional/TestErrorHandling/tests/db_contents_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/heketi/tests"
 
-	"github.com/heketi/heketi/pkg/testutils"
+	"github.com/heketi/heketi/v10/pkg/testutils"
 )
 
 func TestServerStartUnknownDbAttrs(t *testing.T) {
diff --git a/tests/functional/TestErrorHandling/tests/device_remove_test.go b/tests/functional/TestErrorHandling/tests/device_remove_test.go
index a8565df840..2e817dcb67 100644
--- a/tests/functional/TestErrorHandling/tests/device_remove_test.go
+++ b/tests/functional/TestErrorHandling/tests/device_remove_test.go
@@ -23,10 +23,10 @@ import (
 
 	"github.com/heketi/tests"
 
-	inj "github.com/heketi/heketi/executors/injectexec"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	inj "github.com/heketi/heketi/v10/executors/injectexec"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 )
 
 func TestDeviceRemoveOperation(t *testing.T) {
diff --git a/tests/functional/TestErrorHandling/tests/device_test.go b/tests/functional/TestErrorHandling/tests/device_test.go
index 6bfa7ce64f..b876b844d6 100644
--- a/tests/functional/TestErrorHandling/tests/device_test.go
+++ b/tests/functional/TestErrorHandling/tests/device_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -22,12 +23,12 @@ import (
 
 	"github.com/heketi/tests"
 
-	inj "github.com/heketi/heketi/executors/injectexec"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
-	"github.com/heketi/heketi/pkg/remoteexec/ssh"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	inj "github.com/heketi/heketi/v10/executors/injectexec"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/pkg/remoteexec/ssh"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 )
 
 func TestDeviceAddRemoveSymlink(t *testing.T) {
diff --git a/tests/functional/TestErrorHandling/tests/error_inject_test.go b/tests/functional/TestErrorHandling/tests/error_inject_test.go
index 531976094c..e7adc7d60d 100644
--- a/tests/functional/TestErrorHandling/tests/error_inject_test.go
+++ b/tests/functional/TestErrorHandling/tests/error_inject_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -22,11 +23,11 @@ import (
 
 	"github.com/heketi/tests"
 
-	client "github.com/heketi/heketi/client/api/go-client"
-	inj "github.com/heketi/heketi/executors/injectexec"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	inj "github.com/heketi/heketi/v10/executors/injectexec"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 )
 
 func TestHeketiStart(t *testing.T) {
diff --git a/tests/functional/TestErrorHandling/tests/heketi_zone_check_test.go b/tests/functional/TestErrorHandling/tests/heketi_zone_check_test.go
index ba2ea1c6ed..3129a01ddf 100644
--- a/tests/functional/TestErrorHandling/tests/heketi_zone_check_test.go
+++ b/tests/functional/TestErrorHandling/tests/heketi_zone_check_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -19,9 +20,9 @@ import (
 	"path"
 	"testing"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 	"github.com/heketi/tests"
 )
 
diff --git a/tests/functional/TestErrorHandling/tests/limits_test.go b/tests/functional/TestErrorHandling/tests/limits_test.go
index 0e74b48cc4..918180be3f 100644
--- a/tests/functional/TestErrorHandling/tests/limits_test.go
+++ b/tests/functional/TestErrorHandling/tests/limits_test.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/heketi/tests"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 )
 
 func TestMaxVolumesPerCluster(t *testing.T) {
diff --git a/tests/functional/TestErrorHandling/tests/offline_cleanup_test.go b/tests/functional/TestErrorHandling/tests/offline_cleanup_test.go
index 8f24522d3d..575188ff09 100644
--- a/tests/functional/TestErrorHandling/tests/offline_cleanup_test.go
+++ b/tests/functional/TestErrorHandling/tests/offline_cleanup_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -23,10 +24,10 @@ import (
 
 	"github.com/heketi/tests"
 
-	inj "github.com/heketi/heketi/executors/injectexec"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	inj "github.com/heketi/heketi/v10/executors/injectexec"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 )
 
 func TestOfflineCleanup(t *testing.T) {
diff --git a/tests/functional/TestErrorHandling/tests/online_cleanup_test.go b/tests/functional/TestErrorHandling/tests/online_cleanup_test.go
index 3196453e45..d7b7101e4a 100644
--- a/tests/functional/TestErrorHandling/tests/online_cleanup_test.go
+++ b/tests/functional/TestErrorHandling/tests/online_cleanup_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -22,10 +23,10 @@ import (
 
 	"github.com/heketi/tests"
 
-	inj "github.com/heketi/heketi/executors/injectexec"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	inj "github.com/heketi/heketi/v10/executors/injectexec"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 )
 
 func TestOnlineCleanup(t *testing.T) {
diff --git a/tests/functional/TestErrorHandling/tests/options_test.go b/tests/functional/TestErrorHandling/tests/options_test.go
index b866ab93e8..5924a17ee4 100644
--- a/tests/functional/TestErrorHandling/tests/options_test.go
+++ b/tests/functional/TestErrorHandling/tests/options_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -22,11 +23,11 @@ import (
 
 	"github.com/heketi/tests"
 
-	client "github.com/heketi/heketi/client/api/go-client"
-	"github.com/heketi/heketi/middleware"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	"github.com/heketi/heketi/v10/middleware"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 )
 
 func TestBlockVolumeAllocDefaults(t *testing.T) {
diff --git a/tests/functional/TestErrorHandling/tests/rollback_test.go b/tests/functional/TestErrorHandling/tests/rollback_test.go
index e1c88f8036..5f8eacb4ff 100644
--- a/tests/functional/TestErrorHandling/tests/rollback_test.go
+++ b/tests/functional/TestErrorHandling/tests/rollback_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -21,10 +22,10 @@ import (
 
 	"github.com/heketi/tests"
 
-	inj "github.com/heketi/heketi/executors/injectexec"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	inj "github.com/heketi/heketi/v10/executors/injectexec"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 )
 
 func TestBlockVolumeRollback(t *testing.T) {
diff --git a/tests/functional/TestErrorHandling/tests/tag_matching_test.go b/tests/functional/TestErrorHandling/tests/tag_matching_test.go
index a3c68b9039..42edb986d0 100644
--- a/tests/functional/TestErrorHandling/tests/tag_matching_test.go
+++ b/tests/functional/TestErrorHandling/tests/tag_matching_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -19,8 +20,8 @@ import (
 	"path"
 	"testing"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
 	"github.com/heketi/tests"
 )
 
diff --git a/tests/functional/TestErrorHandling/tests/timeout_test.go b/tests/functional/TestErrorHandling/tests/timeout_test.go
index 063b1c78ca..abeabf6635 100644
--- a/tests/functional/TestErrorHandling/tests/timeout_test.go
+++ b/tests/functional/TestErrorHandling/tests/timeout_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -16,11 +17,11 @@ import (
 	"path"
 	"testing"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
-	"github.com/heketi/heketi/pkg/remoteexec/ssh"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/server/config"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/pkg/remoteexec/ssh"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/server/config"
 
 	"github.com/heketi/tests"
 )
diff --git a/tests/functional/TestErrorHandling/tests/update_dbvol_test.go b/tests/functional/TestErrorHandling/tests/update_dbvol_test.go
index d0ab0f5564..d9eb7fe78c 100644
--- a/tests/functional/TestErrorHandling/tests/update_dbvol_test.go
+++ b/tests/functional/TestErrorHandling/tests/update_dbvol_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -23,11 +24,11 @@ import (
 
 	"github.com/heketi/tests"
 
-	//inj "github.com/heketi/heketi/executors/injectexec"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	rex "github.com/heketi/heketi/pkg/remoteexec"
-	"github.com/heketi/heketi/pkg/testutils"
-	//"github.com/heketi/heketi/server/config"
+	//inj "github.com/heketi/heketi/v10/executors/injectexec"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	rex "github.com/heketi/heketi/v10/pkg/remoteexec"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	//"github.com/heketi/heketi/v10/server/config"
 )
 
 func TestUpdateDbVol(t *testing.T) {
diff --git a/tests/functional/TestSmokeTest/tests/admin_modes_test.go b/tests/functional/TestSmokeTest/tests/admin_modes_test.go
index 9dd8ef864e..e6200b8089 100644
--- a/tests/functional/TestSmokeTest/tests/admin_modes_test.go
+++ b/tests/functional/TestSmokeTest/tests/admin_modes_test.go
@@ -17,7 +17,7 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/heketi/tests"
 )
 
diff --git a/tests/functional/TestSmokeTest/tests/arbiter_test.go b/tests/functional/TestSmokeTest/tests/arbiter_test.go
index da88123007..23668e4a08 100644
--- a/tests/functional/TestSmokeTest/tests/arbiter_test.go
+++ b/tests/functional/TestSmokeTest/tests/arbiter_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
 	"github.com/heketi/tests"
 )
 
diff --git a/tests/functional/TestSmokeTest/tests/block_volume_test.go b/tests/functional/TestSmokeTest/tests/block_volume_test.go
index 3f916bc312..a1871481db 100644
--- a/tests/functional/TestSmokeTest/tests/block_volume_test.go
+++ b/tests/functional/TestSmokeTest/tests/block_volume_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -15,8 +16,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
 	"github.com/heketi/tests"
 )
 
diff --git a/tests/functional/TestSmokeTest/tests/delete_test.go b/tests/functional/TestSmokeTest/tests/delete_test.go
index a41f7cecd6..9410a57e7e 100644
--- a/tests/functional/TestSmokeTest/tests/delete_test.go
+++ b/tests/functional/TestSmokeTest/tests/delete_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -16,8 +17,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
 	"github.com/heketi/tests"
 )
 
diff --git a/tests/functional/TestSmokeTest/tests/heketi_test.go b/tests/functional/TestSmokeTest/tests/heketi_test.go
index 30c5bcc2c0..4f6a464c23 100644
--- a/tests/functional/TestSmokeTest/tests/heketi_test.go
+++ b/tests/functional/TestSmokeTest/tests/heketi_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -15,10 +16,10 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/logging"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/pkg/utils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/logging"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/pkg/utils"
 	"github.com/heketi/tests"
 )
 
diff --git a/tests/functional/TestSmokeTest/tests/throttle_test.go b/tests/functional/TestSmokeTest/tests/throttle_test.go
index 05acffb71b..af4e65240c 100644
--- a/tests/functional/TestSmokeTest/tests/throttle_test.go
+++ b/tests/functional/TestSmokeTest/tests/throttle_test.go
@@ -16,9 +16,9 @@ import (
 	"testing"
 	"time"
 
-	client "github.com/heketi/heketi/client/api/go-client"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/utils"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/utils"
 
 	"github.com/heketi/tests"
 )
diff --git a/tests/functional/TestSmokeTest/tests/volume_clone_test.go b/tests/functional/TestSmokeTest/tests/volume_clone_test.go
index eb6edd42a9..a7258adc98 100644
--- a/tests/functional/TestSmokeTest/tests/volume_clone_test.go
+++ b/tests/functional/TestSmokeTest/tests/volume_clone_test.go
@@ -14,7 +14,7 @@ package functional
 import (
 	"testing"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
 	"github.com/heketi/tests"
 )
 
diff --git a/tests/functional/TestSmokeTest/tests/volume_snapshot_behavior_test.go b/tests/functional/TestSmokeTest/tests/volume_snapshot_behavior_test.go
index b032708e25..3f06ca9e88 100644
--- a/tests/functional/TestSmokeTest/tests/volume_snapshot_behavior_test.go
+++ b/tests/functional/TestSmokeTest/tests/volume_snapshot_behavior_test.go
@@ -16,8 +16,8 @@ import (
 
 	"github.com/heketi/tests"
 
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/testutils"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/testutils"
 )
 
 func TestHeketiVolumeSnapshotBehavior(t *testing.T) {
diff --git a/tests/functional/TestVolumeNotDeletedWhenNodeIsDown/tests/heketi_test.go b/tests/functional/TestVolumeNotDeletedWhenNodeIsDown/tests/heketi_test.go
index de67480834..508e104d87 100644
--- a/tests/functional/TestVolumeNotDeletedWhenNodeIsDown/tests/heketi_test.go
+++ b/tests/functional/TestVolumeNotDeletedWhenNodeIsDown/tests/heketi_test.go
@@ -1,3 +1,4 @@
+//go:build functional
 // +build functional
 
 //
@@ -15,11 +16,11 @@ import (
 	"testing"
 	"time"
 
-	client "github.com/heketi/heketi/client/api/go-client"
-	"github.com/heketi/heketi/pkg/glusterfs/api"
-	"github.com/heketi/heketi/pkg/logging"
-	"github.com/heketi/heketi/pkg/testutils"
-	"github.com/heketi/heketi/pkg/utils"
+	client "github.com/heketi/heketi/v10/client/api/go-client"
+	"github.com/heketi/heketi/v10/pkg/glusterfs/api"
+	"github.com/heketi/heketi/v10/pkg/logging"
+	"github.com/heketi/heketi/v10/pkg/testutils"
+	"github.com/heketi/heketi/v10/pkg/utils"
 	"github.com/heketi/tests"
 )