diff --git a/api/v1/imagepolicy_types.go b/api/v1/imagepolicy_types.go
index 6d58f7e5..bf4b8f82 100644
--- a/api/v1/imagepolicy_types.go
+++ b/api/v1/imagepolicy_types.go
@@ -197,7 +197,7 @@ func (in *ImagePolicy) SetConditions(conditions []metav1.Condition) {
 // +kubebuilder:storageversion
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:shortName=imgpol;imagepol
+// +kubebuilder:resource:shortName=imgpol;imagepol,categories=all;fluxcd;fluxcd-images
 // +kubebuilder:printcolumn:name="Image",type=string,JSONPath=`.status.latestRef.name`
 // +kubebuilder:printcolumn:name="Tag",type=string,JSONPath=`.status.latestRef.tag`
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
diff --git a/api/v1/imagerepository_types.go b/api/v1/imagerepository_types.go
index 3a8a7360..00d24816 100644
--- a/api/v1/imagerepository_types.go
+++ b/api/v1/imagerepository_types.go
@@ -210,7 +210,7 @@ func (in ImageRepository) GetRequeueAfter() time.Duration {
 // +kubebuilder:storageversion
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:shortName=imgrepo;imagerepo
+// +kubebuilder:resource:shortName=imgrepo;imagerepo,categories=all;fluxcd;fluxcd-images
 // +kubebuilder:printcolumn:name="Image",type="string",JSONPath=".spec.image"
 // +kubebuilder:printcolumn:name="Tags",type=string,JSONPath=`.status.lastScanResult.tagCount`
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
diff --git a/api/v1beta2/imagepolicy_types.go b/api/v1beta2/imagepolicy_types.go
index 5ba6e557..0d5c8531 100644
--- a/api/v1beta2/imagepolicy_types.go
+++ b/api/v1beta2/imagepolicy_types.go
@@ -198,7 +198,6 @@ func (in *ImagePolicy) SetConditions(conditions []metav1.Condition) {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:shortName=imgpol;imagepol
 // +kubebuilder:skipversion
 
 // ImagePolicy is the Schema for the imagepolicies API
diff --git a/api/v1beta2/imagerepository_types.go b/api/v1beta2/imagerepository_types.go
index 1d2dca12..75c95160 100644
--- a/api/v1beta2/imagerepository_types.go
+++ b/api/v1beta2/imagerepository_types.go
@@ -212,7 +212,6 @@ func (in ImageRepository) GetRequeueAfter() time.Duration {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:shortName=imgrepo;imagerepo
 // +kubebuilder:skipversion
 
 // ImageRepository is the Schema for the imagerepositories API
diff --git a/config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml b/config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml
index ee990df4..24d8865e 100644
--- a/config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml
+++ b/config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml
@@ -8,6 +8,10 @@ metadata:
 spec:
   group: image.toolkit.fluxcd.io
   names:
+    categories:
+    - all
+    - fluxcd
+    - fluxcd-images
     kind: ImagePolicy
     listKind: ImagePolicyList
     plural: imagepolicies
diff --git a/config/crd/bases/image.toolkit.fluxcd.io_imagerepositories.yaml b/config/crd/bases/image.toolkit.fluxcd.io_imagerepositories.yaml
index df3f125c..53e2b319 100644
--- a/config/crd/bases/image.toolkit.fluxcd.io_imagerepositories.yaml
+++ b/config/crd/bases/image.toolkit.fluxcd.io_imagerepositories.yaml
@@ -8,6 +8,10 @@ metadata:
 spec:
   group: image.toolkit.fluxcd.io
   names:
+    categories:
+    - all
+    - fluxcd
+    - fluxcd-images
     kind: ImageRepository
     listKind: ImageRepositoryList
     plural: imagerepositories