1 files changed, 32 insertions, 12 deletions
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc
index 7b15a1c062d..5f97a0e8b18 100644
--- a/config-model/src/main/resources/schema/deployment.rnc
+++ b/config-model/src/main/resources/schema/deployment.rnc
@@ -7,13 +7,37 @@ start = element deployment {
    attribute major-version { text }? &
    attribute athenz-domain { xsd:string }? &
    attribute athenz-service { xsd:string }? &
-   Upgrade? &
-   BlockChange* &
-   Notifications? &
-   Endpoints? &
-   Test? &
-   Staging? &
-   Prod*
+   Step
+}
+
+Step =
+    StepExceptInstance &
+    Instance*
+
+StepExceptInstance =
+    Delay* &
+    ParallelInstances* &
+    Upgrade? &
+    BlockChange* &
+    Notifications* &
+    Endpoints? &
+    Test? &
+    Staging? &
+    Prod*
+
+Instance = element instance {
+   attribute id { xsd:string } &
+   attribute athenz-domain { xsd:string }? &
+   attribute athenz-service { xsd:string }? &
+   StepExceptInstance
+}
+
+ParallelRegions = element parallel {
+    Region*
+}
+
+ParallelInstances = element parallel {
+    Instance*
 }
 
 Upgrade = element upgrade {
@@ -57,7 +81,7 @@ Prod = element prod {
    attribute tester-flavor { xsd:string }? &
    Region* &
    Delay* &
-   Parallel*
+   ParallelRegions*
 }
 
 Region = element region {
@@ -71,10 +95,6 @@ Delay = element delay {
    attribute seconds { xsd:long }?
 }
 
-Parallel = element parallel {
-    Region*
-}
-
 EndpointRegion = element region {
     text
 }