diff --git a/cmd/nvidia-ctk/README.md b/cmd/nvidia-ctk/README.md
index 7fa8abbd..fd73ee9b 100644
--- a/cmd/nvidia-ctk/README.md
+++ b/cmd/nvidia-ctk/README.md
@@ -43,7 +43,7 @@ By default, all commands output to `STDOUT`, but specifying the `--output` flag
 
 ### Generate CDI specifications
 
-The [Container Device Interface (CDI)](https://github.com/container-orchestrated-devices/container-device-interface) provides
+The [Container Device Interface (CDI)](https://tags.cncf.io/container-device-interface) provides
 a vendor-agnostic mechanism to make arbitrary devices accessible in containerized environments. To allow NVIDIA devices to be
 used in these environments, the NVIDIA Container Toolkit CLI includes functionality to generate a CDI specification for the
 available NVIDIA GPUs in a system.
diff --git a/cmd/nvidia-ctk/cdi/generate/generate.go b/cmd/nvidia-ctk/cdi/generate/generate.go
index 830437ca..63828336 100644
--- a/cmd/nvidia-ctk/cdi/generate/generate.go
+++ b/cmd/nvidia-ctk/cdi/generate/generate.go
@@ -28,8 +28,8 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform"
-	cdi "github.com/container-orchestrated-devices/container-device-interface/pkg/parser"
 	"github.com/urfave/cli/v2"
+	cdi "tags.cncf.io/container-device-interface/pkg/parser"
 )
 
 const (
diff --git a/cmd/nvidia-ctk/cdi/list/list.go b/cmd/nvidia-ctk/cdi/list/list.go
index 68530ab8..bb6a6a28 100644
--- a/cmd/nvidia-ctk/cdi/list/list.go
+++ b/cmd/nvidia-ctk/cdi/list/list.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
 	"github.com/urfave/cli/v2"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
 )
 
 type command struct {
diff --git a/cmd/nvidia-ctk/cdi/transform/root/root.go b/cmd/nvidia-ctk/cdi/transform/root/root.go
index ad9d2e22..35c8b63e 100644
--- a/cmd/nvidia-ctk/cdi/transform/root/root.go
+++ b/cmd/nvidia-ctk/cdi/transform/root/root.go
@@ -24,8 +24,8 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
 	"github.com/urfave/cli/v2"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
 )
 
 type command struct {
diff --git a/internal/config/config.go b/internal/config/config.go
index 7393f7ad..f29afc95 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -25,7 +25,7 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/config/image"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/lookup"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
 )
 
 const (
diff --git a/internal/config/image/cuda_image.go b/internal/config/image/cuda_image.go
index 2356fb31..d285dea2 100644
--- a/internal/config/image/cuda_image.go
+++ b/internal/config/image/cuda_image.go
@@ -22,9 +22,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/parser"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"golang.org/x/mod/semver"
+	"tags.cncf.io/container-device-interface/pkg/parser"
 )
 
 const (
diff --git a/internal/discover/hooks.go b/internal/discover/hooks.go
index 3135ea06..d68ecdbd 100644
--- a/internal/discover/hooks.go
+++ b/internal/discover/hooks.go
@@ -19,7 +19,7 @@ package discover
 import (
 	"path/filepath"
 
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
 )
 
 var _ Discover = (*Hook)(nil)
diff --git a/internal/edits/device.go b/internal/edits/device.go
index 72e6b06e..2a5d71c2 100644
--- a/internal/edits/device.go
+++ b/internal/edits/device.go
@@ -18,8 +18,8 @@ package edits
 
 import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type device discover.Device
diff --git a/internal/edits/device_test.go b/internal/edits/device_test.go
index 44c35098..97e4ed8a 100644
--- a/internal/edits/device_test.go
+++ b/internal/edits/device_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"github.com/stretchr/testify/require"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 func TestDeviceToSpec(t *testing.T) {
diff --git a/internal/edits/edits.go b/internal/edits/edits.go
index 492845d1..bc86f499 100644
--- a/internal/edits/edits.go
+++ b/internal/edits/edits.go
@@ -22,9 +22,9 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	ociSpecs "github.com/opencontainers/runtime-spec/specs-go"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type edits struct {
diff --git a/internal/edits/hook.go b/internal/edits/hook.go
index a0e56a85..ec894f86 100644
--- a/internal/edits/hook.go
+++ b/internal/edits/hook.go
@@ -18,8 +18,8 @@ package edits
 
 import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type hook discover.Hook
diff --git a/internal/edits/mount.go b/internal/edits/mount.go
index a5c45582..53b9f45d 100644
--- a/internal/edits/mount.go
+++ b/internal/edits/mount.go
@@ -18,8 +18,8 @@ package edits
 
 import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type mount discover.Mount
diff --git a/internal/modifier/cdi.go b/internal/modifier/cdi.go
index 89a66b9a..d7188f9b 100644
--- a/internal/modifier/cdi.go
+++ b/internal/modifier/cdi.go
@@ -25,7 +25,7 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/modifier/cdi"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/parser"
+	"tags.cncf.io/container-device-interface/pkg/parser"
 )
 
 // NewCDIModifier creates an OCI spec modifier that determines the modifications to make based on the
diff --git a/internal/modifier/cdi/builder.go b/internal/modifier/cdi/builder.go
index 1a491f19..7cae8bcc 100644
--- a/internal/modifier/cdi/builder.go
+++ b/internal/modifier/cdi/builder.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type builder struct {
diff --git a/internal/modifier/cdi/registry.go b/internal/modifier/cdi/registry.go
index 89116f18..7ed12856 100644
--- a/internal/modifier/cdi/registry.go
+++ b/internal/modifier/cdi/registry.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
 	"github.com/opencontainers/runtime-spec/specs-go"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
 )
 
 // fromRegistry represents the modifications performed using a CDI registry.
diff --git a/internal/modifier/cdi/spec.go b/internal/modifier/cdi/spec.go
index 8c54c54a..e33c7aa1 100644
--- a/internal/modifier/cdi/spec.go
+++ b/internal/modifier/cdi/spec.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
 	"github.com/opencontainers/runtime-spec/specs-go"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
 )
 
 // fromCDISpec represents the modifications performed from a raw CDI spec.
diff --git a/pkg/nvcdi/api.go b/pkg/nvcdi/api.go
index 68bfd845..aa3fa31a 100644
--- a/pkg/nvcdi/api.go
+++ b/pkg/nvcdi/api.go
@@ -18,9 +18,9 @@ package nvcdi
 
 import (
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 const (
diff --git a/pkg/nvcdi/full-gpu-nvml.go b/pkg/nvcdi/full-gpu-nvml.go
index 65a01b2e..e69bb033 100644
--- a/pkg/nvcdi/full-gpu-nvml.go
+++ b/pkg/nvcdi/full-gpu-nvml.go
@@ -26,10 +26,10 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/info/drm"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
 	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvml"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 // GetGPUDeviceSpecs returns the CDI device specs for the full GPU represented by 'device'.
diff --git a/pkg/nvcdi/gds.go b/pkg/nvcdi/gds.go
index 2aba8d06..06ca770a 100644
--- a/pkg/nvcdi/gds.go
+++ b/pkg/nvcdi/gds.go
@@ -22,9 +22,9 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type gdslib nvcdilib
diff --git a/pkg/nvcdi/lib-csv.go b/pkg/nvcdi/lib-csv.go
index 22b54b64..6ac1e257 100644
--- a/pkg/nvcdi/lib-csv.go
+++ b/pkg/nvcdi/lib-csv.go
@@ -23,9 +23,9 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/platform-support/tegra"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type csvlib nvcdilib
diff --git a/pkg/nvcdi/lib-nvml.go b/pkg/nvcdi/lib-nvml.go
index db6cabab..d2d3cf52 100644
--- a/pkg/nvcdi/lib-nvml.go
+++ b/pkg/nvcdi/lib-nvml.go
@@ -21,10 +21,10 @@ import (
 
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
 	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvml"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type nvmllib nvcdilib
diff --git a/pkg/nvcdi/lib-wsl.go b/pkg/nvcdi/lib-wsl.go
index 937d1d33..f98c919c 100644
--- a/pkg/nvcdi/lib-wsl.go
+++ b/pkg/nvcdi/lib-wsl.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type wsllib nvcdilib
diff --git a/pkg/nvcdi/management.go b/pkg/nvcdi/management.go
index 56272803..5a740d8a 100644
--- a/pkg/nvcdi/management.go
+++ b/pkg/nvcdi/management.go
@@ -25,9 +25,9 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/cuda"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type managementlib nvcdilib
diff --git a/pkg/nvcdi/mig-device-nvml.go b/pkg/nvcdi/mig-device-nvml.go
index 28f21892..1f37ee80 100644
--- a/pkg/nvcdi/mig-device-nvml.go
+++ b/pkg/nvcdi/mig-device-nvml.go
@@ -23,10 +23,10 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/nvcaps"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
 	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvml"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 // GetMIGDeviceSpecs returns the CDI device specs for the full GPU represented by 'device'.
diff --git a/pkg/nvcdi/mofed.go b/pkg/nvcdi/mofed.go
index 88c147c0..78af1635 100644
--- a/pkg/nvcdi/mofed.go
+++ b/pkg/nvcdi/mofed.go
@@ -22,9 +22,9 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type mofedlib nvcdilib
diff --git a/pkg/nvcdi/spec/api.go b/pkg/nvcdi/spec/api.go
index a72c6dff..b91072c5 100644
--- a/pkg/nvcdi/spec/api.go
+++ b/pkg/nvcdi/spec/api.go
@@ -19,7 +19,7 @@ package spec
 import (
 	"io"
 
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 const (
diff --git a/pkg/nvcdi/spec/builder.go b/pkg/nvcdi/spec/builder.go
index 610cb8ce..c6930800 100644
--- a/pkg/nvcdi/spec/builder.go
+++ b/pkg/nvcdi/spec/builder.go
@@ -21,9 +21,9 @@ import (
 	"os"
 
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/parser"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/pkg/parser"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type builder struct {
diff --git a/pkg/nvcdi/spec/spec.go b/pkg/nvcdi/spec/spec.go
index 999220b7..6594466e 100644
--- a/pkg/nvcdi/spec/spec.go
+++ b/pkg/nvcdi/spec/spec.go
@@ -22,8 +22,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type spec struct {
diff --git a/pkg/nvcdi/transform/api.go b/pkg/nvcdi/transform/api.go
index 9e3e5bd6..786ffb46 100644
--- a/pkg/nvcdi/transform/api.go
+++ b/pkg/nvcdi/transform/api.go
@@ -16,7 +16,7 @@
 
 package transform
 
-import "github.com/container-orchestrated-devices/container-device-interface/specs-go"
+import "tags.cncf.io/container-device-interface/specs-go"
 
 // Transformer defines the API for applying arbitrary transforms to a spec in-place
 type Transformer interface {
diff --git a/pkg/nvcdi/transform/deduplicate.go b/pkg/nvcdi/transform/deduplicate.go
index f9d6db28..27be1b67 100644
--- a/pkg/nvcdi/transform/deduplicate.go
+++ b/pkg/nvcdi/transform/deduplicate.go
@@ -17,7 +17,7 @@
 package transform
 
 import (
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type dedupe struct{}
diff --git a/pkg/nvcdi/transform/deduplicate_test.go b/pkg/nvcdi/transform/deduplicate_test.go
index fe858e21..3a5e6ce9 100644
--- a/pkg/nvcdi/transform/deduplicate_test.go
+++ b/pkg/nvcdi/transform/deduplicate_test.go
@@ -19,8 +19,8 @@ package transform
 import (
 	"testing"
 
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"github.com/stretchr/testify/require"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 func TestDeduplicate(t *testing.T) {
diff --git a/pkg/nvcdi/transform/edits.go b/pkg/nvcdi/transform/edits.go
index 36fac725..fea47ffa 100644
--- a/pkg/nvcdi/transform/edits.go
+++ b/pkg/nvcdi/transform/edits.go
@@ -20,7 +20,7 @@ package transform
 import (
 	"encoding/json"
 
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type containerEdits specs.ContainerEdits
diff --git a/pkg/nvcdi/transform/merge.go b/pkg/nvcdi/transform/merge.go
index 2fd9a6a9..762107b3 100644
--- a/pkg/nvcdi/transform/merge.go
+++ b/pkg/nvcdi/transform/merge.go
@@ -16,7 +16,7 @@
 
 package transform
 
-import "github.com/container-orchestrated-devices/container-device-interface/specs-go"
+import "tags.cncf.io/container-device-interface/specs-go"
 
 type merged []Transformer
 
diff --git a/pkg/nvcdi/transform/merged-device.go b/pkg/nvcdi/transform/merged-device.go
index 9bd6b99d..523876e3 100644
--- a/pkg/nvcdi/transform/merged-device.go
+++ b/pkg/nvcdi/transform/merged-device.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
 
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/parser"
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/pkg/parser"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 const (
diff --git a/pkg/nvcdi/transform/merged-device_test.go b/pkg/nvcdi/transform/merged-device_test.go
index 10328530..14b19fb7 100644
--- a/pkg/nvcdi/transform/merged-device_test.go
+++ b/pkg/nvcdi/transform/merged-device_test.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"github.com/stretchr/testify/require"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 func TestMergeDeviceSpecs(t *testing.T) {
diff --git a/pkg/nvcdi/transform/no-op.go b/pkg/nvcdi/transform/no-op.go
index 7985f195..be2bacf7 100644
--- a/pkg/nvcdi/transform/no-op.go
+++ b/pkg/nvcdi/transform/no-op.go
@@ -17,7 +17,7 @@
 package transform
 
 import (
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type noop struct{}
diff --git a/pkg/nvcdi/transform/remove.go b/pkg/nvcdi/transform/remove.go
index 06c8500d..bc009485 100644
--- a/pkg/nvcdi/transform/remove.go
+++ b/pkg/nvcdi/transform/remove.go
@@ -19,7 +19,7 @@ package transform
 import (
 	"fmt"
 
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type remove map[string]bool
diff --git a/pkg/nvcdi/transform/root.go b/pkg/nvcdi/transform/root.go
index 6ff9c75e..555b9e51 100644
--- a/pkg/nvcdi/transform/root.go
+++ b/pkg/nvcdi/transform/root.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type rootTransformer struct {
diff --git a/pkg/nvcdi/transform/root_test.go b/pkg/nvcdi/transform/root_test.go
index 0d036f90..a16d0950 100644
--- a/pkg/nvcdi/transform/root_test.go
+++ b/pkg/nvcdi/transform/root_test.go
@@ -19,8 +19,8 @@ package transform
 import (
 	"testing"
 
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"github.com/stretchr/testify/require"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 func TestRootTransformer(t *testing.T) {
diff --git a/pkg/nvcdi/transform/simplify.go b/pkg/nvcdi/transform/simplify.go
index ddc6f597..23bdfed8 100644
--- a/pkg/nvcdi/transform/simplify.go
+++ b/pkg/nvcdi/transform/simplify.go
@@ -19,7 +19,7 @@ package transform
 import (
 	"fmt"
 
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type simplify struct{}
diff --git a/pkg/nvcdi/transform/simplify_test.go b/pkg/nvcdi/transform/simplify_test.go
index 8b312c20..2e1c1527 100644
--- a/pkg/nvcdi/transform/simplify_test.go
+++ b/pkg/nvcdi/transform/simplify_test.go
@@ -19,8 +19,8 @@ package transform
 import (
 	"testing"
 
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"github.com/stretchr/testify/require"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 func TestSimplify(t *testing.T) {
diff --git a/pkg/nvcdi/transform/sorter.go b/pkg/nvcdi/transform/sorter.go
index 573fcac6..2fc53ac3 100644
--- a/pkg/nvcdi/transform/sorter.go
+++ b/pkg/nvcdi/transform/sorter.go
@@ -22,7 +22,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 type sorter struct{}
diff --git a/pkg/nvcdi/transform/sorter_test.go b/pkg/nvcdi/transform/sorter_test.go
index 94643ca9..79242d5d 100644
--- a/pkg/nvcdi/transform/sorter_test.go
+++ b/pkg/nvcdi/transform/sorter_test.go
@@ -19,8 +19,8 @@ package transform
 import (
 	"testing"
 
-	"github.com/container-orchestrated-devices/container-device-interface/specs-go"
 	"github.com/stretchr/testify/require"
+	"tags.cncf.io/container-device-interface/specs-go"
 )
 
 func TestSortSpec(t *testing.T) {
diff --git a/tools/container/toolkit/toolkit.go b/tools/container/toolkit/toolkit.go
index 93766b23..9e090e68 100644
--- a/tools/container/toolkit/toolkit.go
+++ b/tools/container/toolkit/toolkit.go
@@ -26,11 +26,11 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/system/nvdevices"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
-	"github.com/container-orchestrated-devices/container-device-interface/pkg/parser"
 	toml "github.com/pelletier/go-toml"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
+	"tags.cncf.io/container-device-interface/pkg/parser"
 )
 
 const (