diff --git a/internal/gitaly/storage/storagemgr/middleware.go b/internal/gitaly/storage/storagemgr/middleware.go
index b352ec5d77513492d996e5b009f7c1bd2f985804..558ffb7ab9d3a23cc5eed64517f2bd945422578c 100644
--- a/internal/gitaly/storage/storagemgr/middleware.go
+++ b/internal/gitaly/storage/storagemgr/middleware.go
@@ -278,7 +278,7 @@ func beginTransactionForPartition(ctx context.Context, logger log.Logger, txRegi
 		return transactionalizedRequest{}, fmt.Errorf("get storage: %w", err)
 	}
 
-	partition, err := storageHandle.GetPartition(ctx, targetPartition)
+	partition, err := storageHandle.GetPartition(ctx, storage.PartitionID(targetPartition))
 	if err != nil {
 		return transactionalizedRequest{}, fmt.Errorf("get partition: %w", err)
 	}
diff --git a/internal/grpc/protoregistry/method_info.go b/internal/grpc/protoregistry/method_info.go
index 837b826b8b45621be0ba7623684291121200c949..1e17962e049991f9204a362d1f9264c607e6bccf 100644
--- a/internal/grpc/protoregistry/method_info.go
+++ b/internal/grpc/protoregistry/method_info.go
@@ -6,7 +6,6 @@ import (
 	"strconv"
 	"strings"
 
-	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/protoutil"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
 	"google.golang.org/protobuf/proto"
@@ -201,7 +200,7 @@ func (mi MethodInfo) getStorageField(msg proto.Message) (valueField, error) {
 }
 
 // Partition returns the partition id for a protobuf message if it exists
-func (mi MethodInfo) Partition(msg proto.Message) (storage.PartitionID, error) {
+func (mi MethodInfo) Partition(msg proto.Message) (uint64, error) {
 	field, err := mi.getPartitionField(msg)
 	if err != nil {
 		return 0, err
@@ -212,7 +211,7 @@ func (mi MethodInfo) Partition(msg proto.Message) (storage.PartitionID, error) {
 		return 0, err
 	}
 
-	return storage.PartitionID(value), nil
+	return value, nil
 }
 
 func (mi MethodInfo) getPartitionField(msg proto.Message) (valueField, error) {
diff --git a/internal/offloading/sink.go b/internal/offloading/sink.go
index 8ea3a17407ccdd287ba0b174a48bb959fc424260..32d62051651464e8a2befb1626c15d75ea533eae 100644
--- a/internal/offloading/sink.go
+++ b/internal/offloading/sink.go
@@ -13,11 +13,11 @@ import (
 	"gocloud.dev/blob"
 	"golang.org/x/sync/errgroup"
 
-	_ "gocloud.dev/blob/azureblob" // register Azure driver
-	_ "gocloud.dev/blob/fileblob"  // register file driver
-	_ "gocloud.dev/blob/gcsblob"   // register Google Cloud driver
-	_ "gocloud.dev/blob/memblob"   // register in-memory driver
-	_ "gocloud.dev/blob/s3blob"
+	//_ "gocloud.dev/blob/azureblob" // register Azure driver
+	//_ "gocloud.dev/blob/fileblob"  // register file driver
+	_ "gocloud.dev/blob/gcsblob" // register Google Cloud driver
+	//_ "gocloud.dev/blob/memblob"   // register in-memory driver
+	//_ "gocloud.dev/blob/s3blob"
 )
 
 var (