diff --git a/src/aosm/azext_aosm/configuration_models/onboarding_base_input_config.py b/src/aosm/azext_aosm/configuration_models/onboarding_base_input_config.py
index bcc02c14ae8..a47c3533258 100644
--- a/src/aosm/azext_aosm/configuration_models/onboarding_base_input_config.py
+++ b/src/aosm/azext_aosm/configuration_models/onboarding_base_input_config.py
@@ -17,7 +17,7 @@ class OnboardingBaseInputConfig(ABC):
 
     location: str = field(
         default="",
-        metadata={"comment": "Azure location to use when creating resources."},
+        metadata={"comment": "Azure location to use when creating resources e.g uksouth"},
     )
     publisher_name: str = field(
         default="",
@@ -37,12 +37,12 @@ class OnboardingBaseInputConfig(ABC):
             )
         },
     )
-    acr_artifact_store_name: str | None = field(
+    acr_artifact_store_name: str = field(
         default="",
         metadata={
             "comment": (
-                "Optional. Name of the ACR Artifact Store resource.\n"
-                "Will be created if it does not exist (with a default name if none is supplied)."
+                "Name of the ACR Artifact Store resource.\n"
+                "Will be created if it does not exist."
             )
         },
     )
@@ -55,3 +55,5 @@ def validate(self):
             raise ValidationError("Publisher name must be set")
         if not self.publisher_resource_group_name:
             raise ValidationError("Publisher resource group name must be set")
+        if not self.acr_artifact_store_name:
+            raise ValidationError("Artifact store name must be set")
diff --git a/src/aosm/azext_aosm/configuration_models/onboarding_cnf_input_config.py b/src/aosm/azext_aosm/configuration_models/onboarding_cnf_input_config.py
index c9717afcb17..608810bee85 100644
--- a/src/aosm/azext_aosm/configuration_models/onboarding_cnf_input_config.py
+++ b/src/aosm/azext_aosm/configuration_models/onboarding_cnf_input_config.py
@@ -97,7 +97,7 @@ class OnboardingCNFInputConfig(OnboardingNFDBaseInputConfig):
 
     # TODO: Add better comment for images as not a list
     images: ImageSourceConfig = field(
-        default_factory=ImageSourceConfig, metadata={"comment": "List of images "}
+        default_factory=ImageSourceConfig, metadata={"comment": "Source of images to be included in the CNF."}
     )
     helm_packages: List[HelmPackageConfig] = field(
         default_factory=lambda: [HelmPackageConfig()],