diff --git a/apis/garage/gvk.go b/apis/garage/gvk.go
new file mode 100644
index 0000000000..caab915de9
--- /dev/null
+++ b/apis/garage/gvk.go
@@ -0,0 +1,16 @@
+package garage
+
+import "k8s.io/apimachinery/pkg/runtime/schema"
+
+const (
+	Group   = "garage.rajsingh.info"
+	Version = "v1beta1"
+)
+
+var (
+	GroupVersion = schema.GroupVersion{Group: Group, Version: Version}
+
+	GarageBucketGVK  = GroupVersion.WithKind("GarageBucket")
+	GarageKeyGVK     = GroupVersion.WithKind("GarageKey")
+	GarageClusterGVK = GroupVersion.WithKind("GarageCluster")
+)
diff --git a/pkg/comp-functions/functions/vshngarage/deploy.go b/pkg/comp-functions/functions/vshngarage/deploy.go
index df18fa0abd..e34803e170 100644
--- a/pkg/comp-functions/functions/vshngarage/deploy.go
+++ b/pkg/comp-functions/functions/vshngarage/deploy.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	xfnproto "github.com/crossplane/function-sdk-go/proto/v1"
+	"github.com/vshn/appcat/v4/apis/garage"
 	"github.com/vshn/appcat/v4/apis/helm/release/v1beta1"
 	vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1"
 	"github.com/vshn/appcat/v4/pkg/common/utils"
@@ -73,8 +74,8 @@ func DeployGarage(ctx context.Context, comp *vshnv1.VSHNGarage, svc *runtime.Ser
 	connectionDetails := []v1beta1.ConnectionDetail{
 		{
 			ObjectReference: corev1.ObjectReference{
-				APIVersion: "garage.rajsingh.info/v1beta1",
-				Kind:       "GarageCluster",
+				APIVersion: garage.GroupVersion.String(),
+				Kind:       garage.GarageClusterGVK.Kind,
 				Name:       "garage",
 				Namespace:  comp.GetInstanceNamespace(),
 				FieldPath:  "status.endpoints.s3",
diff --git a/pkg/controller/garagebucket/cleanup_controller.go b/pkg/controller/garagebucket/cleanup_controller.go
index 629b0ec8d1..2c5ff74745 100644
--- a/pkg/controller/garagebucket/cleanup_controller.go
+++ b/pkg/controller/garagebucket/cleanup_controller.go
@@ -9,11 +9,11 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
+	"github.com/vshn/appcat/v4/apis/garage"
 	vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -27,11 +27,7 @@ import (
 
 const adminCredentialsSecret = "admin-s3-credentials"
 
-var garageBucketGVK = schema.GroupVersionKind{
-	Group:   "garage.rajsingh.info",
-	Version: "v1alpha1",
-	Kind:    "GarageBucket",
-}
+var garageBucketGVK = garage.GarageBucketGVK
 
 // CleanupReconciler watches GarageBucket resources and empties the underlying
 // S3 bucket when deletion is requested, using dedicated admin credentials.
diff --git a/pkg/sliexporter/vshngarage_controller/vshngarage_controller.go b/pkg/sliexporter/vshngarage_controller/vshngarage_controller.go
index c0bfbfb8ac..6db48bc1c3 100644
--- a/pkg/sliexporter/vshngarage_controller/vshngarage_controller.go
+++ b/pkg/sliexporter/vshngarage_controller/vshngarage_controller.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
+	"github.com/vshn/appcat/v4/apis/garage"
 	vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1"
 	"github.com/vshn/appcat/v4/pkg/common/utils"
 	"github.com/vshn/appcat/v4/pkg/sliexporter/probes"
@@ -17,7 +18,6 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -30,17 +30,10 @@ const (
 	adminTokenSecret     = "garage-admin-token"
 )
 
-var garageBucketGVK = schema.GroupVersionKind{
-	Group:   "garage.rajsingh.info",
-	Version: "v1beta1",
-	Kind:    "GarageBucket",
-}
-
-var garageKeyGVK = schema.GroupVersionKind{
-	Group:   "garage.rajsingh.info",
-	Version: "v1beta1",
-	Kind:    "GarageKey",
-}
+var (
+	garageBucketGVK = garage.GarageBucketGVK
+	garageKeyGVK    = garage.GarageKeyGVK
+)
 
 type VSHNGarageReconciler struct {
 	client.Client