diff --git a/src/aosm/azext_aosm/cli_handlers/onboarding_cnf_handler.py b/src/aosm/azext_aosm/cli_handlers/onboarding_cnf_handler.py
index 3cd1707770e..1b0ea8a487c 100644
--- a/src/aosm/azext_aosm/cli_handlers/onboarding_cnf_handler.py
+++ b/src/aosm/azext_aosm/cli_handlers/onboarding_cnf_handler.py
@@ -298,7 +298,7 @@ def build_all_parameters_json(self) -> JSONDefinitionElementBuilder:
             "publisherName": self.config.publisher_name,
             "publisherResourceGroupName": self.config.publisher_resource_group_name,
             "acrArtifactStoreName": self.config.acr_artifact_store_name,
-            "acrManifestName": self.config.acr_artifact_store_name + "-manifest",
+            "acrManifestName": self.config.acr_manifest_name,
             "nfDefinitionGroup": self.config.nf_name,
             "nfDefinitionVersion": self.config.version,
         }
diff --git a/src/aosm/azext_aosm/cli_handlers/onboarding_core_vnf_handler.py b/src/aosm/azext_aosm/cli_handlers/onboarding_core_vnf_handler.py
index 65af6a13890..f35d7df5ad2 100644
--- a/src/aosm/azext_aosm/cli_handlers/onboarding_core_vnf_handler.py
+++ b/src/aosm/azext_aosm/cli_handlers/onboarding_core_vnf_handler.py
@@ -114,7 +114,7 @@ def build_all_parameters_json(self) -> JSONDefinitionElementBuilder:
             "publisherResourceGroupName": self.config.publisher_resource_group_name,
             "acrArtifactStoreName": self.config.acr_artifact_store_name,
             "saArtifactStoreName": self.config.blob_artifact_store_name,
-            "acrManifestName": self.config.acr_artifact_store_name + "-manifest",
+            "acrManifestName": self.config.acr_manifest_name,
             "saManifestName": self.config.sa_manifest_name,
             "nfDefinitionGroup": self.config.nf_name,
             "nfDefinitionVersion": self.config.version
diff --git a/src/aosm/azext_aosm/cli_handlers/onboarding_nexus_vnf_handler.py b/src/aosm/azext_aosm/cli_handlers/onboarding_nexus_vnf_handler.py
index 32a2b78df68..ee5676b18cf 100644
--- a/src/aosm/azext_aosm/cli_handlers/onboarding_nexus_vnf_handler.py
+++ b/src/aosm/azext_aosm/cli_handlers/onboarding_nexus_vnf_handler.py
@@ -113,7 +113,7 @@ def build_all_parameters_json(self) -> JSONDefinitionElementBuilder:
             "publisherName": self.config.publisher_name,
             "publisherResourceGroupName": self.config.publisher_resource_group_name,
             "acrArtifactStoreName": self.config.acr_artifact_store_name,
-            "acrManifestName": self.config.acr_artifact_store_name + "-manifest",
+            "acrManifestName": self.config.acr_manifest_name,
             "nfDefinitionGroup": self.config.nf_name,
             "nfDefinitionVersion": self.config.version
         }
diff --git a/src/aosm/azext_aosm/cli_handlers/onboarding_nsd_handler.py b/src/aosm/azext_aosm/cli_handlers/onboarding_nsd_handler.py
index 148e9a0a4a1..a8d8cb626be 100644
--- a/src/aosm/azext_aosm/cli_handlers/onboarding_nsd_handler.py
+++ b/src/aosm/azext_aosm/cli_handlers/onboarding_nsd_handler.py
@@ -270,7 +270,7 @@ def build_all_parameters_json(self) -> JSONDefinitionElementBuilder:
             "publisherName": self.config.publisher_name,
             "publisherResourceGroupName": self.config.publisher_resource_group_name,
             "acrArtifactStoreName": self.config.acr_artifact_store_name,
-            "acrManifestName": self.config.acr_artifact_store_name + "-manifest",
+            "acrManifestName": self.config.acr_manifest_name,
             "nsDesignGroup": self.config.nsd_name,
             "nsDesignVersion": self.config.nsd_version,
             "nfviSiteName": self.nfvi_site_name,
diff --git a/src/aosm/azext_aosm/configuration_models/onboarding_nfd_base_input_config.py b/src/aosm/azext_aosm/configuration_models/onboarding_nfd_base_input_config.py
index 9129946aa0c..824e7cc9ae2 100644
--- a/src/aosm/azext_aosm/configuration_models/onboarding_nfd_base_input_config.py
+++ b/src/aosm/azext_aosm/configuration_models/onboarding_nfd_base_input_config.py
@@ -26,6 +26,12 @@ class OnboardingNFDBaseInputConfig(OnboardingBaseInputConfig):
         },
     )
 
+    @property
+    def acr_manifest_name(self) -> str:
+        """Return the Storage account manifest name from the NFD name."""
+        sanitized_acr_name = self.acr_artifact_store_name.lower().replace("_", "-")
+        return f"{sanitized_acr_name}-acr-manifest-{self.version.replace('.', '-')}"
+
     def validate(self):
         """Validate the configuration."""
         super().validate()
diff --git a/src/aosm/azext_aosm/configuration_models/onboarding_nsd_input_config.py b/src/aosm/azext_aosm/configuration_models/onboarding_nsd_input_config.py
index 7744db69ebf..7a0574ee809 100644
--- a/src/aosm/azext_aosm/configuration_models/onboarding_nsd_input_config.py
+++ b/src/aosm/azext_aosm/configuration_models/onboarding_nsd_input_config.py
@@ -193,6 +193,12 @@ class OnboardingNSDInputConfig(OnboardingBaseInputConfig):
         )
     )
 
+    @property
+    def acr_manifest_name(self) -> str:
+        """Return the Storage account manifest name from the NFD name."""
+        sanitized_acr_name = self.acr_artifact_store_name.lower().replace("_", "-")
+        return f"{sanitized_acr_name}-nsd-manifest-{self.nsd_version.replace('.', '-')}"
+
     def validate(self):
         """Validate the configuration."""
         super().validate()
diff --git a/src/aosm/azext_aosm/configuration_models/onboarding_vnf_input_config.py b/src/aosm/azext_aosm/configuration_models/onboarding_vnf_input_config.py
index 13984a07d92..1c48a5c9739 100644
--- a/src/aosm/azext_aosm/configuration_models/onboarding_vnf_input_config.py
+++ b/src/aosm/azext_aosm/configuration_models/onboarding_vnf_input_config.py
@@ -154,7 +154,7 @@ def __post_init__(self):
     @property
     def sa_manifest_name(self) -> str:
         """Return the Storage account manifest name from the NFD name."""
-        return f"{self.blob_artifact_store_name}-manifest-{self.version.replace('.', '-')}"
+        return f"{self.blob_artifact_store_name}-sa-manifest-{self.version.replace('.', '-')}"
 
     def validate(self):
         """Validate the configuration."""