diff --git a/apis/actions.github.com/v1alpha1/autoscalinglistener_types.go b/apis/actions.github.com/v1alpha1/autoscalinglistener_types.go
index 3106e225..b35705f8 100644
--- a/apis/actions.github.com/v1alpha1/autoscalinglistener_types.go
+++ b/apis/actions.github.com/v1alpha1/autoscalinglistener_types.go
@@ -31,6 +31,7 @@ type AutoscalingListenerSpec struct {
 	GitHubConfigSecret string `json:"githubConfigSecret,omitempty"`
 
 	// +required
+	// +kubebuilder:validation:Minimum=1
 	RunnerScaleSetID int `json:"runnerScaleSetId,omitempty"`
 
 	// +required
@@ -53,7 +54,7 @@ type AutoscalingListenerSpec struct {
 	// +required
 	Image string `json:"image,omitempty"`
 
-	// +required
+	// +optional
 	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
 
 	// +optional
diff --git a/apis/actions.github.com/v1alpha1/autoscalingrunnerset_types.go b/apis/actions.github.com/v1alpha1/autoscalingrunnerset_types.go
index ce0507d5..23a3230c 100644
--- a/apis/actions.github.com/v1alpha1/autoscalingrunnerset_types.go
+++ b/apis/actions.github.com/v1alpha1/autoscalingrunnerset_types.go
@@ -44,10 +44,13 @@ import (
 
 // AutoscalingRunnerSet is the Schema for the autoscalingrunnersets API
 type AutoscalingRunnerSet struct {
-	metav1.TypeMeta   `json:",inline"`
+	metav1.TypeMeta `json:",inline"`
+	// +optional
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   AutoscalingRunnerSetSpec   `json:"spec,omitempty"`
+	// +optional
+	Spec AutoscalingRunnerSetSpec `json:"spec,omitempty"`
+	// +optional
 	Status AutoscalingRunnerSetStatus `json:"status,omitempty"`
 }
 
diff --git a/charts/gha-runner-scale-set-controller-experimental/crds/actions.github.com_autoscalinglisteners.yaml b/charts/gha-runner-scale-set-controller-experimental/crds/actions.github.com_autoscalinglisteners.yaml
index 756cb966..92652986 100644
--- a/charts/gha-runner-scale-set-controller-experimental/crds/actions.github.com_autoscalinglisteners.yaml
+++ b/charts/gha-runner-scale-set-controller-experimental/crds/actions.github.com_autoscalinglisteners.yaml
@@ -232,6 +232,7 @@ spec:
                     type: object
                 type: object
               runnerScaleSetId:
+                minimum: 1
                 type: integer
               serviceAccountMetadata:
                 description: ResourceMeta carries metadata common to all internal
@@ -8808,7 +8809,6 @@ spec:
             - githubConfigSecret
             - githubConfigUrl
             - image
-            - imagePullSecrets
             - maxRunners
             - minRunners
             - runnerScaleSetId
diff --git a/charts/gha-runner-scale-set-controller/crds/actions.github.com_autoscalinglisteners.yaml b/charts/gha-runner-scale-set-controller/crds/actions.github.com_autoscalinglisteners.yaml
index 756cb966..92652986 100644
--- a/charts/gha-runner-scale-set-controller/crds/actions.github.com_autoscalinglisteners.yaml
+++ b/charts/gha-runner-scale-set-controller/crds/actions.github.com_autoscalinglisteners.yaml
@@ -232,6 +232,7 @@ spec:
                     type: object
                 type: object
               runnerScaleSetId:
+                minimum: 1
                 type: integer
               serviceAccountMetadata:
                 description: ResourceMeta carries metadata common to all internal
@@ -8808,7 +8809,6 @@ spec:
             - githubConfigSecret
             - githubConfigUrl
             - image
-            - imagePullSecrets
             - maxRunners
             - minRunners
             - runnerScaleSetId
diff --git a/config/crd/bases/actions.github.com_autoscalinglisteners.yaml b/config/crd/bases/actions.github.com_autoscalinglisteners.yaml
index 756cb966..92652986 100644
--- a/config/crd/bases/actions.github.com_autoscalinglisteners.yaml
+++ b/config/crd/bases/actions.github.com_autoscalinglisteners.yaml
@@ -232,6 +232,7 @@ spec:
                     type: object
                 type: object
               runnerScaleSetId:
+                minimum: 1
                 type: integer
               serviceAccountMetadata:
                 description: ResourceMeta carries metadata common to all internal
@@ -8808,7 +8809,6 @@ spec:
             - githubConfigSecret
             - githubConfigUrl
             - image
-            - imagePullSecrets
             - maxRunners
             - minRunners
             - runnerScaleSetId