diff --git a/.ci/automation-schema.yaml b/.ci/automation-schema.yaml
index 415e12a3c..e47fc0cfb 100644
--- a/.ci/automation-schema.yaml
+++ b/.ci/automation-schema.yaml
@@ -4,7 +4,7 @@
 # We are using yamale to validate files
 # https://github.com/23andMe/Yamale
 ---
-vas: map(include('_architecture'), key=str())
+vas: map(include('_architecture'), key=str(), min=1, max=1)
 
 ---
 # Define various nested types
diff --git a/.ci/validate-schema-paths.py b/.ci/validate-schema-paths.py
index 94b18c31b..a2836156a 100644
--- a/.ci/validate-schema-paths.py
+++ b/.ci/validate-schema-paths.py
@@ -24,6 +24,8 @@ def __run_file(self, f):
             content = yaml.safe_load(fh)
         for scenario in content['vas']:
             print(f'  Checking scenario: {scenario}')
+            assert (rel.name == f'{scenario}.yaml'), \
+            f'!! {rel.name} does not match {scenario}.yaml'
             self.__validate(content['vas'][scenario])
 
     def __validate(self, scenario):