diff --git a/pkg/endpoints/installer.go b/pkg/endpoints/installer.go
index b6c0ccad4..bb82e4139 100644
--- a/pkg/endpoints/installer.go
+++ b/pkg/endpoints/installer.go
@@ -878,7 +878,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
 		apiResource.Categories = categoriesProvider.Categories()
 	}
 	if gvkProvider, ok := storage.(rest.GroupVersionKindProvider); ok {
-		gvk := gvkProvider.GroupVersionKind()
+		gvk := gvkProvider.GroupVersionKind(a.group.GroupVersion)
 		apiResource.Group = gvk.Group
 		apiResource.Version = gvk.Version
 		apiResource.Kind = gvk.Kind
diff --git a/pkg/registry/rest/rest.go b/pkg/registry/rest/rest.go
index 42a3b0973..21673110f 100644
--- a/pkg/registry/rest/rest.go
+++ b/pkg/registry/rest/rest.go
@@ -82,7 +82,7 @@ type CategoriesProvider interface {
 // This trumps KindProvider since it is capable of providing the information required.
 // TODO KindProvider (only used by federation) should be removed and replaced with this, but that presents greater risk late in 1.8.
 type GroupVersionKindProvider interface {
-	GroupVersionKind() schema.GroupVersionKind
+	GroupVersionKind(containingGV schema.GroupVersion) schema.GroupVersionKind
 }
 
 // Lister is an object that can retrieve resources that match the provided field and label criteria.