diff --git a/apis/mpas/v1alpha1/repository_types.go b/apis/mpas/v1alpha1/repository_types.go
index 4a19644..8e00f40 100644
--- a/apis/mpas/v1alpha1/repository_types.go
+++ b/apis/mpas/v1alpha1/repository_types.go
@@ -45,10 +45,11 @@ type RepositorySpec struct {
 	//+optional
 	Interval metav1.Duration `json:"interval,omitempty"`
 	//+optional
+	//+kubebuilder:validation:Enum=public;private;internal
 	//+kubebuilder:default:=private
 	Visibility string `json:"visibility,omitempty"`
 	//+kubebuilder:default:=true
-	IsOrganization bool `json:"isOrganization,omitempty"`
+	IsOrganization bool `json:"isOrganization"`
 	//+optional
 	Domain string `json:"domain,omitempty"`
 	//+optional
diff --git a/config/crd/bases/mpas.ocm.software_repositories.yaml b/config/crd/bases/mpas.ocm.software_repositories.yaml
index 338cb73..37248b4 100644
--- a/config/crd/bases/mpas.ocm.software_repositories.yaml
+++ b/config/crd/bases/mpas.ocm.software_repositories.yaml
@@ -82,9 +82,14 @@ spec:
                 type: string
               visibility:
                 default: private
+                enum:
+                - public
+                - private
+                - internal
                 type: string
             required:
             - credentials
+            - isOrganization
             - owner
             - provider
             - repositoryName