diff --git a/core/metadata/db.go b/core/metadata/db.go
index ea748f9a9..8fb8409f2 100644
--- a/core/metadata/db.go
+++ b/core/metadata/db.go
@@ -29,7 +29,7 @@ import (
 	eventstypes "github.com/containerd/containerd/v2/api/events"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/snapshots"
-	"github.com/containerd/containerd/v2/pkg/cleanup"
+	"github.com/containerd/containerd/v2/internal/cleanup"
 	"github.com/containerd/containerd/v2/pkg/events"
 	"github.com/containerd/containerd/v2/pkg/gc"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
diff --git a/pkg/cleanup/context.go b/internal/cleanup/context.go
similarity index 100%
rename from pkg/cleanup/context.go
rename to internal/cleanup/context.go
diff --git a/pkg/cleanup/context_test.go b/internal/cleanup/context_test.go
similarity index 100%
rename from pkg/cleanup/context_test.go
rename to internal/cleanup/context_test.go
diff --git a/pkg/rootfs/diff.go b/pkg/rootfs/diff.go
index 1accbc34e..8659670bf 100644
--- a/pkg/rootfs/diff.go
+++ b/pkg/rootfs/diff.go
@@ -23,7 +23,7 @@ import (
 	"github.com/containerd/containerd/v2/core/diff"
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/core/snapshots"
-	"github.com/containerd/containerd/v2/pkg/cleanup"
+	"github.com/containerd/containerd/v2/internal/cleanup"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go
index 204739f3a..e1954fd0c 100644
--- a/pkg/unpack/unpacker.go
+++ b/pkg/unpack/unpacker.go
@@ -33,7 +33,7 @@ import (
 	"github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/core/snapshots"
-	"github.com/containerd/containerd/v2/pkg/cleanup"
+	"github.com/containerd/containerd/v2/internal/cleanup"
 	"github.com/containerd/containerd/v2/pkg/errdefs"
 	"github.com/containerd/containerd/v2/pkg/kmutex"
 	"github.com/containerd/containerd/v2/pkg/labels"
diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go
index d0f45d04b..a721ce226 100644
--- a/runtime/v2/manager.go
+++ b/runtime/v2/manager.go
@@ -29,7 +29,7 @@ import (
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/core/metadata"
 	"github.com/containerd/containerd/v2/core/sandbox"
-	"github.com/containerd/containerd/v2/pkg/cleanup"
+	"github.com/containerd/containerd/v2/internal/cleanup"
 	"github.com/containerd/containerd/v2/pkg/errdefs"
 	"github.com/containerd/containerd/v2/pkg/events/exchange"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
diff --git a/runtime/v2/shim_load.go b/runtime/v2/shim_load.go
index 3f59a7a2e..1d5b48fce 100644
--- a/runtime/v2/shim_load.go
+++ b/runtime/v2/shim_load.go
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 
 	"github.com/containerd/containerd/v2/core/mount"
-	"github.com/containerd/containerd/v2/pkg/cleanup"
+	"github.com/containerd/containerd/v2/internal/cleanup"
 	"github.com/containerd/containerd/v2/pkg/errdefs"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	"github.com/containerd/containerd/v2/pkg/timeout"