diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
index 8c6d9b8e5a..625a1186cf 100644
--- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
+++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.apimanagement.service.yml b/.azuredevops/modulePipelines/ms.apimanagement.service.yml
index 95915c6a01..43ae45a010 100644
--- a/.azuredevops/modulePipelines/ms.apimanagement.service.yml
+++ b/.azuredevops/modulePipelines/ms.apimanagement.service.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Soft-delete prevents re-deployment
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
index 3c683d0816..de861c4f52 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
index 67d7dde23e..4b2f2aaad4 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
index 19a1fcd672..7a879e7a96 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
index 1cb80bbbc9..9744ad6659 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
index 19600537e0..b5797df0d5 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
index 72e4f9e8e1..476fbfa93e 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml b/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
index 8553649c93..b379d53d38 100644
--- a/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml b/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
index 767dcc1299..7c10f8bad4 100644
--- a/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml b/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
index e52e017279..b95d423f85 100644
--- a/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
+++ b/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Soft-delete prevents re-deployment
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml b/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
index 01c3a1df7b..13f0d8bfba 100644
--- a/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml b/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
index 65452edf49..ab1a408aa0 100644
--- a/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.compute.galleries.yml b/.azuredevops/modulePipelines/ms.compute.galleries.yml
index a2afb4891a..df5e4455b4 100644
--- a/.azuredevops/modulePipelines/ms.compute.galleries.yml
+++ b/.azuredevops/modulePipelines/ms.compute.galleries.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -59,9 +51,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.compute.images.yml b/.azuredevops/modulePipelines/ms.compute.images.yml
index 7d29fbfebe..fcd28cee5b 100644
--- a/.azuredevops/modulePipelines/ms.compute.images.yml
+++ b/.azuredevops/modulePipelines/ms.compute.images.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml b/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
index 51e1602840..21ce3f518d 100644
--- a/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
+++ b/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml b/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
index 1e948f5e39..ec6e767fa1 100644
--- a/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
+++ b/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml b/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
index 2a83a190d6..b8b9df5d9e 100644
--- a/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.consumption.budgets.yml b/.azuredevops/modulePipelines/ms.consumption.budgets.yml
index f6e1ca04f5..2889da6088 100644
--- a/.azuredevops/modulePipelines/ms.consumption.budgets.yml
+++ b/.azuredevops/modulePipelines/ms.consumption.budgets.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml b/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
index 007d229d81..97c564067c 100644
--- a/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
+++ b/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.containerregistry.registries.yml b/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
index 6d3080f72e..c42b35b3ef 100644
--- a/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
+++ b/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml b/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
index 07c15fc6c0..9b4f47bf46 100644
--- a/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
+++ b/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.databricks.workspaces.yml b/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
index d0990ef41e..bca0286704 100644
--- a/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.datafactory.factories.yml b/.azuredevops/modulePipelines/ms.datafactory.factories.yml
index a570bed763..e54b36af14 100644
--- a/.azuredevops/modulePipelines/ms.datafactory.factories.yml
+++ b/.azuredevops/modulePipelines/ms.datafactory.factories.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
index 74d1fa7f78..16c658a13d 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
index 7ba4b43072..ed7bb6b14a 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
index 059a6ba89b..d00f5b1916 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml b/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
index 03f8d068f8..2203a61f3e 100644
--- a/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -56,9 +48,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.eventgrid.topics.yml b/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
index b320869ba3..ba5ee65dbf 100644
--- a/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
+++ b/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml b/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
index 8c0da3a36a..63b16c5b3a 100644
--- a/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
+++ b/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml b/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
index 40dbc80b59..0f86658225 100644
--- a/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
+++ b/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.insights.actiongroups.yml b/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
index 6e9ad5354a..5afa006aab 100644
--- a/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
+++ b/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml b/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
index 71cb442e9b..aaac601f78 100644
--- a/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
+++ b/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.insights.components.yml b/.azuredevops/modulePipelines/ms.insights.components.yml
index 452c0a6239..b2ed166630 100644
--- a/.azuredevops/modulePipelines/ms.insights.components.yml
+++ b/.azuredevops/modulePipelines/ms.insights.components.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml b/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
index 4ce387ab35..5a12f84758 100644
--- a/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
+++ b/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Needs custom removals script
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.insights.metricalerts.yml b/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
index b7fabf63b7..3042e4dabd 100644
--- a/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
+++ b/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml b/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
index 1cee449cd1..fd71a6746d 100644
--- a/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
+++ b/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml b/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
index 162ec4c177..7e83d3b938 100644
--- a/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
+++ b/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.keyvault.vaults.yml b/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
index 38caa06264..5458a9b78d 100644
--- a/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
+++ b/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Soft-delete prevents re-deployment
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.logic.workflows.yml b/.azuredevops/modulePipelines/ms.logic.workflows.yml
index 9da0d7f59f..0b8e56730e 100644
--- a/.azuredevops/modulePipelines/ms.logic.workflows.yml
+++ b/.azuredevops/modulePipelines/ms.logic.workflows.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml b/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
index 580bef93b9..c831fb4b78 100644
--- a/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml b/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
index f96fb1daf5..f20e2d034d 100644
--- a/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
+++ b/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml b/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
index 2a2b4fb0a1..76e583bd45 100644
--- a/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Needs a custom removal script
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.management.managementgroups.yml b/.azuredevops/modulePipelines/ms.management.managementgroups.yml
index 365c23e333..cc6f67fd1e 100644
--- a/.azuredevops/modulePipelines/ms.management.managementgroups.yml
+++ b/.azuredevops/modulePipelines/ms.management.managementgroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml b/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
index d2adcf8592..c0beec10e7 100644
--- a/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -56,9 +48,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.applicationgateways.yml b/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
index e97079bec5..b680e5787d 100644
--- a/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml b/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
index 3c77231099..892d102c27 100644
--- a/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml b/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
index 5ee7949b5a..42a913133f 100644
--- a/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
+++ b/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.bastionhosts.yml b/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
index 0d3bf576ad..f94e4c9330 100644
--- a/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
+++ b/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.connections.yml b/.azuredevops/modulePipelines/ms.network.connections.yml
index 3960895c38..43c0f01ec5 100644
--- a/.azuredevops/modulePipelines/ms.network.connections.yml
+++ b/.azuredevops/modulePipelines/ms.network.connections.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml b/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
index 46e9c1fd3e..78e5096841 100644
--- a/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
+++ b/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml b/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
index ccc9c15ded..d328763a7a 100644
--- a/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
+++ b/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
new file mode 100644
index 0000000000..febae276d5
--- /dev/null
+++ b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
@@ -0,0 +1,51 @@
+name: 'Network - Firewallpolicies'
+
+parameters:
+  - name: removeDeployment
+    displayName: Remove deployed module
+    type: boolean
+    default: true
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
+
+trigger:
+  batch: true
+  branches:
+    include:
+      - main
+  paths:
+    include:
+      - '/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml'
+      - '/.azuredevops/pipelineTemplates/module.*.yml'
+      - '/arm/Microsoft.Network/firewallpolicies/*'
+    exclude:
+      - '/**/*.md'
+
+variables:
+  - template: '/.azuredevops/pipelineVariables/global.variables.yml'
+  - group: 'PLATFORM_VARIABLES'
+  - name: modulePath
+    value: '/arm/Microsoft.Network/firewallpolicies'
+
+stages:
+  - stage: Validation
+    displayName: Pester tests
+    jobs:
+      - template: /.azuredevops/pipelineTemplates/module.jobs.validate.yml
+
+  - stage: Deployment
+    displayName: Deployment tests
+    jobs:
+      - template: /.azuredevops/pipelineTemplates/module.jobs.deploy.yml
+        parameters:
+          removeDeployment: '${{ parameters.removeDeployment }}'
+          deploymentBlocks:
+            - path: $(modulePath)/.parameters/parameters.json
+
+  - stage: Publishing
+    displayName: Publish module
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
+    jobs:
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.ipgroups.yml b/.azuredevops/modulePipelines/ms.network.ipgroups.yml
index 3a6b8f025d..14c98650b4 100644
--- a/.azuredevops/modulePipelines/ms.network.ipgroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.ipgroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.loadbalancers.yml b/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
index 06ab2a0978..bc5150aee2 100644
--- a/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
+++ b/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml b/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
index 0a4deda3ec..6325a2b080 100644
--- a/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.natgateways.yml b/.azuredevops/modulePipelines/ms.network.natgateways.yml
index 508361d3df..0d8930a1a7 100644
--- a/.azuredevops/modulePipelines/ms.network.natgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.natgateways.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml b/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
index d572d1f057..d2ee2f9ccc 100644
--- a/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.networkwatchers.yml b/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
index 9dfaa8c748..c9befd2cae 100644
--- a/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
+++ b/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Required as a dependency + Only one Network Watcher can exist in the same location. If removed, a default would be created in a dedicated RG
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.privatednszones.yml b/.azuredevops/modulePipelines/ms.network.privatednszones.yml
index a8b29fedfb..581625a02f 100644
--- a/.azuredevops/modulePipelines/ms.network.privatednszones.yml
+++ b/.azuredevops/modulePipelines/ms.network.privatednszones.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.privateendpoints.yml b/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
index 6f334eb015..45b3b539ae 100644
--- a/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
+++ b/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml b/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
index 14858a220a..73bf881d15 100644
--- a/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
+++ b/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml b/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
index 4b7d9e662a..1be45a7d4a 100644
--- a/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
+++ b/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.routetables.yml b/.azuredevops/modulePipelines/ms.network.routetables.yml
index fc517ca79a..c3d0c05fb5 100644
--- a/.azuredevops/modulePipelines/ms.network.routetables.yml
+++ b/.azuredevops/modulePipelines/ms.network.routetables.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml b/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
index 51a0dc1224..32059ca83d 100644
--- a/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
+++ b/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml b/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
index 42bf81265d..c73ac8fa22 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml b/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
index ca80478983..cedac4fbb4 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.network.virtualwans.yml b/.azuredevops/modulePipelines/ms.network.virtualwans.yml
index f85920974e..bef3372daf 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualwans.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualwans.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml b/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
index 048abae2f9..497dceb9fc 100644
--- a/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml b/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
index ec1e513daa..77dae89ca6 100644
--- a/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
+++ b/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml b/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
index 70eb973d2d..b5e131051f 100644
--- a/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
+++ b/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml b/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
index 5e812cafb1..02638da8e8 100644
--- a/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
+++ b/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml b/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
index 0ca942ef1f..f5e26899e7 100644
--- a/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
+++ b/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Needs custom removals script
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml b/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
index 58fc4936c7..b75325c71e 100644
--- a/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
+++ b/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
index 8e474d6696..eca56f1d7f 100644
--- a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
+++ b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
diff --git a/.azuredevops/modulePipelines/ms.sql.managedinstances.yml b/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
index 35d049dc25..5734b967ce 100644
--- a/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
+++ b/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.sql.servers.yml b/.azuredevops/modulePipelines/ms.sql.servers.yml
index efa1438b55..4a162b3985 100644
--- a/.azuredevops/modulePipelines/ms.sql.servers.yml
+++ b/.azuredevops/modulePipelines/ms.sql.servers.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
index 603f521c13..0dafd10e8b 100644
--- a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -56,9 +48,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml b/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
index 67aeeade37..81d79c3b0a 100644
--- a/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
+++ b/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml b/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
index 43f64ae89e..99ce80ebb8 100644
--- a/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
+++ b/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.web.connections.yml b/.azuredevops/modulePipelines/ms.web.connections.yml
index c896ac399c..b660563779 100644
--- a/.azuredevops/modulePipelines/ms.web.connections.yml
+++ b/.azuredevops/modulePipelines/ms.web.connections.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml b/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
index bd153c9fba..3d51d4a232 100644
--- a/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
+++ b/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.web.serverfarms.yml b/.azuredevops/modulePipelines/ms.web.serverfarms.yml
index f29806eb4e..9702390049 100644
--- a/.azuredevops/modulePipelines/ms.web.serverfarms.yml
+++ b/.azuredevops/modulePipelines/ms.web.serverfarms.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/modulePipelines/ms.web.sites.yml b/.azuredevops/modulePipelines/ms.web.sites.yml
index 735953088b..32c7b7f9ab 100644
--- a/.azuredevops/modulePipelines/ms.web.sites.yml
+++ b/.azuredevops/modulePipelines/ms.web.sites.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
diff --git a/.azuredevops/pipelineTemplates/jobs.publishModule.yml b/.azuredevops/pipelineTemplates/jobs.publishModule.yml
index 2d4e014332..2164e11514 100644
--- a/.azuredevops/pipelineTemplates/jobs.publishModule.yml
+++ b/.azuredevops/pipelineTemplates/jobs.publishModule.yml
@@ -14,7 +14,7 @@
 ##---------------------------------------------##
 ##
 ## By default it uses the variables specified in the below [parameters] section. However, you can overwrite these variables in the
-##    referencing pipeline by providing the paramater explicitly.
+##    referencing pipeline by providing the parameter explicitly.
 ##
 ## NOTE: If you don't need to overwrite a shared value, you can IGNORE this section
 ##
@@ -26,18 +26,17 @@
 ##   | poolName                        | '$(poolName)'                        | You can provide either a [poolname] or [vmImage] to run the job on                                      | 'Custom Deployment Pool'          |
 ##   | vmImage                         | '$(vmImage)'                         | You can provide either a [poolname] or [vmImage] to run the job on                                      | 'ubuntu20.04'                     |
 ##   | defaultJobTimeoutInMinutes      | 120                                  | The timeout for the job in this pipeline                                                                | 120                               |
-##   | versionOption                   | '$(versionOption)'                   | The mode to handle the version increments [major|minor|patch|custom].                                   | 'patch'                           |
-##   | moduleVersion                   | '$(moduleVersion)'                   | The version to enforce if [versionOption] is set to [custom]                                            | '1.0.0'                           |
 ##   | modulePath                      | '$(modulePath)'                      | The path to the module to deploy. E.g. [c:/KeyVault]                                                    | 'c:/KeyVault'                     |
 ##   | templateSpecsRGName             | '$(templateSpecsRGName)'             | Required to publish to template spec. ResourceGroup of the template spec to publish to                  | 'mgmt-rg'                         |
 ##   | templateSpecsRGLocation         | '$(templateSpecsRGLocation)'         | Required to publish to template spec. Location of the template spec resource group                      | 'West Europe'                     |
 ##   | templateSpecsDescription        | '$(templateSpecsDescription)'        | Required to publish to template spec. Description of the template spec to publish to                    | 'IaCs module'                     |
+##   | vstsFeedToken                   | '$(vstsFeedToken)'                   | Required to publish to a DevOps feed. Token with access to the feed to publish to.                      | '...'                             |
 ##   | vstsFeedName                    | '$(vstsFeedName)'                    | Required to publish to a DevOps feed. Name to the feed to publish to.                                   | 'modules'                         |
-##   | vstsProject                     | '$(System.TeamProject)'              | Required to publish to a DevOps feed. Name of the project hosting the artifacts feed. May be empty.     | 'iacs'                            |
+##   | vstsFeedProject                 | '$(vstsFeedProject)'                 | Required to publish to a DevOps feed. Name of the project hosting the artifacts feed. May be empty.     | 'iacs'                            |
 ##   | bicepRegistryName               | '$(bicepRegistryName)'               | Required to publish to the private bicep registry. Name of the hosting container registry               | 'adpsxxazacrx001'                 |
 ##   | bicepRegistryRGName             | '$(bicepRegistryRGName)'             | Required to publish to the private bicep registry. Resource group of the hosting container registry     | 'artifacts-rg'                    |
 ##   | bicepRegistryRgLocation         | '$(bicepRegistryRgLocation)'         | Required to publish to the private bicep registry. Location of the RG of the hosting container registry | 'West Europe'                     |
-##   | vstsOrganization                | '$(vstsOrganization)'                | Required to publish to a DevOps feed. Name of the organization hosting the artifacts feed.              | 'servicescode'                    |
+##   | vstsOrganizationUri             | '$(vstsOrganizationUri)'             | Required to publish to a DevOps feed. Name of the organization hosting the artifacts feed.              | 'servicescode'                    |
 ##   | azurePowerShellVersion          | '$(azurePowerShellVersion)'          | Used for configuring the Azure PowerShell Version, one of the example values.                           | 'latestVersion' or 'OtherVersion' |
 ##   | preferredAzurePowerShellVersion | '$(preferredAzurePowerShellVersion)' | Used for configuring the Azure PowerShell Version, either an empty string or specific version.          | '4.4.0'                           |
 ##   |======================================================================================================================================================================================================================|
@@ -56,21 +55,23 @@ parameters:
 
   # Logic-related parameters
   ## Module-related
-  versionOption: '$(versionOption)'
-  moduleVersion: '$(moduleVersion)'
   modulePath: '$(modulePath)'
 
   ## TemplateSpec-related
+  templateSpecsDoPublish: '$(templateSpecsDoPublish)'
   templateSpecsRGName: '$(templateSpecsRGName)'
   templateSpecsRGLocation: '$(templateSpecsRGLocation)'
   templateSpecsDescription: '$(templateSpecsDescription)'
 
   ## Artifact-Feed-related
+  artifactsFeedDoPublish: '$(artifactsFeedDoPublish)'
+  vstsOrganizationUri: '$(vstsOrganizationUri)'
+  vstsFeedProject: '$(vstsFeedProject)'
   vstsFeedName: '$(vstsFeedName)'
-  vstsProject: '$(System.TeamProject)'
-  vstsOrganization: '$(vstsOrganization)'
+  vstsFeedToken: '$(vstsFeedToken)'
 
   ## Private-Bicep-Registry-related
+  bicepRegistryDoPublish: '$(bicepRegistryDoPublish)'
   bicepRegistryName: '$(bicepRegistryName)'
   bicepRegistryRGName: '$(bicepRegistryRGName)'
   bicepRegistryRgLocation: '$(bicepRegistryRgLocation)'
@@ -142,57 +143,55 @@ jobs:
 
       # [Universal Artifact-feed publish] task(s)
       #------------------------------------------
-      - powershell: |
-          # Load used functions
-          . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Initialize-UniversalArtifactPublish.ps1')
-
-          $functionInput = @{
-            templateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
-            vstsOrganization = '${{ parameters.vstsOrganization }}'
-            vstsProject      = '${{ parameters.vstsProject }}'
-            vstsFeedName     = '${{ parameters.vstsFeedName }}'
-            customVersion    = '${{ parameters.customVersion }}'
-            versioningOption = '${{ parameters.versioningOption }}'
-          }
-
-          Write-Verbose "Invoke task with" -Verbose
-          Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
-
-          $output = Initialize-UniversalArtifactPublish @functionInput -Verbose
-
-          # Write output value(s) into pipeline environment
-          $output.Keys | ForEach-Object {
-            Write-Host ("Publishing variable [{0}] with value [{1}] to pipeline environment" -f $_, $output[$_])
-            Write-Host ("##vso[task.setVariable variable={0}]{1}" -f $_, $output[$_])
-          }
-        displayName: 'Prepare publish to artifacts feed'
+      - task: PowerShell@2
+        displayName: 'Publish module to artifacts feed'
         condition: and(
           eq(variables['artifactsFeedDoPublish'], true),
           succeeded()
           )
         enabled: true
-        env:
-          TOKEN: $(system.accesstoken)
-
-      - task: UniversalPackages@0
-        condition: and(
-          eq(variables['artifactsFeedDoPublish'], true),
-          succeeded()
-          )
-        displayName: Publish Universal Package
         inputs:
-          command: publish
-          publishDirectory: '$(ENVMODULEPATH)'
-          ${{ if eq(parameters.vstsProject, '') }}:
-            vstsFeedPublish: '${{ parameters.vstsFeedName }}'
-          ${{ if ne(parameters.vstsProject, '') }}:
-            vstsFeedPublish: '${{ parameters.vstsProject }}/${{ parameters.vstsFeedName }}'
-          vstsFeedPackagePublish: '$(universalPackageModuleName)' # Published via [Initialize-UniversalArtifactPublish] invocation
-          versionOption: '$(publishingMode)' # Published via [Initialize-UniversalArtifactPublish] invocation
-          versionPublish: '$(newVersionObject)' # Published via [Initialize-UniversalArtifactPublish] invocation
-          packagePublishDescription: '$(universalPackageModuleName) Module'
-          verbosity: 'error'
-        enabled: true
+          targetType: inline
+          pwsh: true
+          script: |
+            # Load used functions
+            . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
+            . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Publish-ModuleToUniversalArtifactFeed.ps1')
+
+            #Prioritizing the bicep file
+            $TemplateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
+            if (-not (Test-Path $TemplateFilePath)) {
+              $TemplateFilePath = Join-Path -Path $FolderPath -ChildPath 'deploy.json'
+            }
+
+            $functionInput = @{
+              TemplateFilePath = $TemplateFilePath
+            }
+
+            Write-Verbose "Invoke Get-ModulesToUpdate with" -Verbose
+            Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+
+            # Get the modified child resources
+            $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
+
+            # Publish the modified child resources
+            foreach ($ModuleToUpdate in $ModulesToUpdate) {
+              $functionInput = @{
+                TemplateFilePath = $ModuleToUpdate.TemplateFilePath
+                VstsOrganizationUri = '${{ parameters.vstsOrganizationUri }}'
+                VstsFeedProject  = '${{ parameters.vstsFeedProject }}'
+                VstsFeedName     = '${{ parameters.vstsFeedName }}'
+                ModuleVersion    = $ModuleToUpdate.Version
+                BearerToken      = $env:TOKEN
+              }
+
+              Write-Verbose "Invoke Publish-ModuleToUniversalArtifactFeed with" -Verbose
+              Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+
+              Publish-ModuleToUniversalArtifactFeed @functionInput -Verbose
+            }
+        env:
+          TOKEN: $(vstsFeedToken)
 
       # [template-spec publish] task(s)
       #--------------------------------
@@ -211,21 +210,40 @@ jobs:
           ScriptType: InlineScript
           inline: |
             # Load used functions
+            . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
             . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Publish-ModuleToTemplateSpec.ps1')
 
+            #Prioritizing the bicep file
+            $TemplateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
+            if (-not (Test-Path $TemplateFilePath)) {
+              $TemplateFilePath = Join-Path -Path $FolderPath -ChildPath 'deploy.json'
+            }
+
             $functionInput = @{
-              templateFilePath         = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
-              templateSpecsRgName      = '${{ parameters.templateSpecsRgName }}'
-              templateSpecsRgLocation  = '${{ parameters.templateSpecsRgLocation }}'
-              templateSpecsDescription = '${{ parameters.templateSpecsDescription }}'
-              customVersion            = '${{ parameters.customVersion }}'
-              versioningOption         = '${{ parameters.versioningOption }}'
+              TemplateFilePath = $TemplateFilePath
             }
 
-            Write-Verbose "Invoke task with" -Verbose
+            Write-Verbose "Invoke Get-ModulesToUpdate with" -Verbose
             Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
-            Publish-ModuleToTemplateSpec @functionInput -Verbose
+            # Get the modified child resources
+            $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
+
+            # Publish the modified child resources
+            foreach ($ModuleToUpdate in $ModulesToUpdate) {
+              $functionInput = @{
+                TemplateFilePath         = $ModuleToUpdate.TemplateFilePath
+                TemplateSpecsRgName      = '${{ parameters.templateSpecsRgName }}'
+                TemplateSpecsRgLocation  = '${{ parameters.templateSpecsRgLocation }}'
+                TemplateSpecsDescription = '${{ parameters.templateSpecsDescription }}'
+                ModuleVersion            = $ModuleToUpdate.Version
+              }
+
+              Write-Verbose "Invoke Publish-ModuleToTemplateSpec with" -Verbose
+              Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+
+              Publish-ModuleToTemplateSpec @functionInput -Verbose
+            }
 
       # [private bicep registry publish] task(s)
       #-------------------------------------------
@@ -244,18 +262,37 @@ jobs:
           ScriptType: InlineScript
           inline: |
             # Load used functions
+            . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
             . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')
 
+            #Prioritizing the bicep file
+            $TemplateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
+            if (-not (Test-Path $TemplateFilePath)) {
+              $TemplateFilePath = Join-Path -Path $FolderPath -ChildPath 'deploy.json'
+            }
+
             $functionInput = @{
-              templateFilePath        = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
-              bicepRegistryName       = '${{ parameters.bicepRegistryName }}'
-              bicepRegistryRgName     = '${{ parameters.bicepRegistryRgName }}'
-              bicepRegistryRgLocation = '${{ parameters.bicepRegistryRgLocation }}'
-              customVersion           = '${{ parameters.customVersion }}'
-              versioningOption        = '${{ parameters.versioningOption }}'
+              TemplateFilePath = $TemplateFilePath
             }
 
-            Write-Verbose "Invoke task with" -Verbose
+            Write-Verbose "Invoke Get-ModulesToUpdate with" -Verbose
             Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
-            Publish-ModuleToPrivateBicepRegistry @functionInput -Verbose
+            # Get the modified child resources
+            $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
+
+            # Publish the modified child resources
+            foreach ($ModuleToUpdate in $ModulesToUpdate) {
+              $functionInput = @{
+                TemplateFilePath         = $ModuleToUpdate.TemplateFilePath
+                BicepRegistryName       = '${{ parameters.bicepRegistryName }}'
+                BicepRegistryRgName     = '${{ parameters.bicepRegistryRgName }}'
+                BicepRegistryRgLocation = '${{ parameters.bicepRegistryRgLocation }}'
+                ModuleVersion            = $ModuleToUpdate.Version
+              }
+
+              Write-Verbose "Invoke Publish-ModuleToPrivateBicepRegistry with" -Verbose
+              Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+
+              Publish-ModuleToPrivateBicepRegistry @functionInput -Verbose
+            }
diff --git a/.azuredevops/pipelineTemplates/jobs.validateModulePester.yml b/.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
index ff45280b39..288ff4416d 100644
--- a/.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
+++ b/.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
@@ -2,7 +2,7 @@
 ## VALIDATION PIPELINE                                 ##
 #########################################################
 ##
-## This pipeline template contains the logic to validate a given modue's ARM template using the provided parameter file(s)
+## This pipeline template contains the logic to validate a given module's ARM template using the provided parameter file(s)
 ##
 ## Enabled levels of validation
 ## - Resource-Group-Level
diff --git a/.azuredevops/pipelineVariables/global.variables.yml b/.azuredevops/pipelineVariables/global.variables.yml
index 71f67a5d77..7e790694b8 100644
--- a/.azuredevops/pipelineVariables/global.variables.yml
+++ b/.azuredevops/pipelineVariables/global.variables.yml
@@ -12,6 +12,7 @@ variables:
   ######################################
 
   vstsOrganization: servicescode
+  vstsOrganizationURI: '$(System.CollectionUri)' # The URI of the TFS collection or Azure DevOps organization. For example: https://dev.azure.com/fabrikam/.
   vstsProject: '$(System.TeamProject)'
   modulesRepository: ResourceModules # The repository hosting the deployment code (i.e. 'Components'). MUST be provided as a variable with every pipeline
   modulePath: arm/$(moduleName) # only use in module pipelines
@@ -40,6 +41,7 @@ variables:
   artifactsFeedDoPublish: true # Set to true, if you would like to publish modules as Universal Packages (in Azure DevOps Artifacts)
   vstsFeedName: 'ResourceModules' # The name of the Azure DevOps universal packages feed to publish to
   vstsFeedProject: '$(System.TeamProject)' # The project that hosts the feed
+  vstsFeedToken: $(System.AccessToken) # The token used to publish universal packages into the feed above
 
   ######################################
   # Publish: Private Bicep Registry settings
diff --git a/.github/actions/templates/getWorkflowInput/action.yml b/.github/actions/templates/getWorkflowInput/action.yml
index b7019b919d..398f57d545 100644
--- a/.github/actions/templates/getWorkflowInput/action.yml
+++ b/.github/actions/templates/getWorkflowInput/action.yml
@@ -10,12 +10,6 @@ outputs:
   removeDeployment:
     description: 'Remove deployed module'
     value: ${{ steps.get-input-param-action.outputs.removeDeployment }}
-  versioningOption:
-    description: 'The mode to handle the version increments [major|minor|patch]'
-    value: ${{ steps.get-input-param-action.outputs.versioningOption }}
-  customVersion:
-    description: 'Custom version to apply. Used only if higher than latest'
-    value: ${{ steps.get-input-param-action.outputs.customVersion }}
 
 runs:
   using: 'composite'
@@ -29,8 +23,6 @@ runs:
         if ('${{ github.event_name }}' -eq 'workflow_dispatch') {
 
           $removeDeployment='${{ github.event.inputs.removeDeployment }}'
-          $versioningOption='${{ github.event.inputs.versioningOption }}'
-          $customVersion='${{ github.event.inputs.customVersion }}'
         }
         # Otherwise retrieve default values
         else {
@@ -46,12 +38,8 @@ runs:
 
           $workflowParameters = Get-WorkflowDefaultInput @functionInput -Verbose
           $removeDeployment = $workflowParameters.removeDeployment
-          $versioningOption = $workflowParameters.versioningOption
-          $customVersion = $workflowParameters.customVersion
         }
 
         # Output values to be accessed by next jobs
         Write-Output "::set-output name=removeDeployment::$removeDeployment"
-        Write-Output "::set-output name=versioningOption::$versioningOption"
-        Write-Output "::set-output name=customVersion::$customVersion"
       shell: pwsh
diff --git a/.github/actions/templates/getWorkflowInput/scripts/Get-WorkflowDefaultInput.ps1 b/.github/actions/templates/getWorkflowInput/scripts/Get-WorkflowDefaultInput.ps1
index c7270a4fb2..6db706dcd3 100644
--- a/.github/actions/templates/getWorkflowInput/scripts/Get-WorkflowDefaultInput.ps1
+++ b/.github/actions/templates/getWorkflowInput/scripts/Get-WorkflowDefaultInput.ps1
@@ -42,7 +42,7 @@ function Get-WorkflowDefaultInput {
         function Get-LineIndentation {
             [CmdletBinding()]
             param (
-                [Parameter()]
+                [Parameter(Mandatory = $false)]
                 [string] $Line
             )
             begin {}
@@ -88,6 +88,7 @@ function Get-WorkflowDefaultInput {
             param (
                 [Parameter(Mandatory)]
                 [string] $InputName,
+
                 [Parameter(Mandatory)]
                 [string[]] $Content
             )
@@ -121,8 +122,6 @@ function Get-WorkflowDefaultInput {
 
         $workflowParameters = @{
             removeDeployment = Get-DefaultValue -InputName 'removeDeployment' -Content $workflowContent -Verbose
-            versioningOption = Get-DefaultValue -InputName 'versioningOption' -Content $workflowContent -Verbose
-            customVersion    = Get-DefaultValue -InputName 'customVersion' -Content $workflowContent -Verbose
         }
 
         Write-Verbose 'Get workflow default input complete'
@@ -135,11 +134,3 @@ function Get-WorkflowDefaultInput {
         Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
     }
 }
-
-
-$Test = @'
-One
-Two
-Three
-Four
-'@
diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index 7feb663233..3610e9c40c 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -5,14 +5,6 @@ inputs:
   templateFilePath:
     description: 'The path to the template file to publish'
     required: true
-  versioningOption:
-    description: 'The mode to handle the version increments [major|minor|patch].'
-    default: 'patch'
-    required: false
-  customVersion:
-    description: 'Custom version to apply. Used only if higher than latest'
-    default: '0.0.1'
-    required: false
   templateSpecsRgName:
     description: 'Required to publish to template spec. ResourceGroup of the template spec to publish to'
     required: false
@@ -67,56 +59,68 @@ runs:
 
     - name: 'Publish module to template specs'
       shell: pwsh
-      # if: ${{ inputs.templateSpecsDoPublish == 'true' }}
+      if: ${{ inputs.templateSpecsDoPublish == 'true' }}
       run: |
-        # Workaround until composite actions support conditions
-        # Once available, remove this if and enable the step condition
-        if('${{ inputs.templateSpecsDoPublish }}' -eq 'true') {
+        # Load used functions
+        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
+        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToTemplateSpec.ps1')
+
+        $functionInput = @{
+          TemplateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
+        }
 
-          # Load used functions
-          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToTemplateSpec.ps1')
+        Write-Verbose "Invoke task with" -Verbose
+        Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
+        # Get the modified child resources
+        $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
+
+        # Publish the modified child resources
+        foreach ($ModuleToUpdate in $ModulesToUpdate) {
           $functionInput = @{
-            templateFilePath         = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
-            templateSpecsRgName      = '${{ inputs.templateSpecsRgName }}'
-            templateSpecsRgLocation  = '${{ inputs.templateSpecsRgLocation }}'
-            templateSpecsDescription = '${{ inputs.templateSpecsDescription }}'
-            customVersion            = '${{ inputs.customVersion }}'
-            versioningOption         = '${{ inputs.versioningOption }}'
+            TemplateFilePath         = $ModuleToUpdate.TemplateFilePath
+            TemplateSpecsRgName      = '${{ inputs.templateSpecsRgName }}'
+            TemplateSpecsRgLocation  = '${{ inputs.templateSpecsRgLocation }}'
+            TemplateSpecsDescription = '${{ inputs.templateSpecsDescription }}'
+            ModuleVersion            = $ModuleToUpdate.Version
           }
 
           Write-Verbose "Invoke task with" -Verbose
           Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
           Publish-ModuleToTemplateSpec @functionInput -Verbose
-        } else {
-          Write-Output "Pipeline is configured to not publish to TemplateSpecs"
         }
 
     - name: 'Publish module to private bicep registry'
       shell: pwsh
-      # if: ${{ inputs.bicepRegistryDoPublish == 'true' }}
+      if: ${{ inputs.bicepRegistryDoPublish == 'true' }}
       run: |
-        # Workaround until composite actions support conditions
-        # Once available, remove this if and enable the step condition
-        if('${{ inputs.bicepRegistryDoPublish }}' -eq 'true') {
+        # Load used functions
+        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
+        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')
+
+        $functionInput = @{
+          TemplateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
+        }
+
+        Write-Verbose "Invoke task with" -Verbose
+        Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
-          # Load used functions
-          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')
+        # Get the modified child resources
+        $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
 
+        # Publish the modified child resources
+        foreach ($ModuleToUpdate in $ModulesToUpdate) {
           $functionInput = @{
-            templateFilePath        = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
-            bicepRegistryName       = '${{ inputs.bicepRegistryName }}'
-            bicepRegistryRgName     = '${{ inputs.bicepRegistryRgName }}'
-            bicepRegistryRgLocation = '${{ inputs.bicepRegistryRgLocation }}'
-            customVersion           = '${{ inputs.customVersion }}'
-            versioningOption        = '${{ inputs.versioningOption }}'
+            TemplateFilePath        = $ModuleToUpdate.TemplateFilePath
+            BicepRegistryName       = '${{ inputs.bicepRegistryName }}'
+            BicepRegistryRgName     = '${{ inputs.bicepRegistryRgName }}'
+            BicepRegistryRgLocation = '${{ inputs.bicepRegistryRgLocation }}'
+            ModuleVersion           = $ModuleToUpdate.Version
           }
 
           Write-Verbose "Invoke task with" -Verbose
           Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
           Publish-ModuleToPrivateBicepRegistry @functionInput -Verbose
-        } else {
-          Write-Output "Pipeline is configured to not publish to TemplateSpecs"
         }
diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml
index b69f15dc30..ac017a39bf 100644
--- a/.github/workflows/ms.analysisservices.servers.yml
+++ b/.github/workflows/ms.analysisservices.servers.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.apimanagement.service.yml b/.github/workflows/ms.apimanagement.service.yml
index ddb9248105..1be6e59d8b 100644
--- a/.github/workflows/ms.apimanagement.service.yml
+++ b/.github/workflows/ms.apimanagement.service.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.authorization.policyassignments.yml b/.github/workflows/ms.authorization.policyassignments.yml
index 5515ee5229..d35c7f00e3 100644
--- a/.github/workflows/ms.authorization.policyassignments.yml
+++ b/.github/workflows/ms.authorization.policyassignments.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -121,7 +111,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -139,8 +129,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.authorization.policydefinitions.yml b/.github/workflows/ms.authorization.policydefinitions.yml
index 25c17ec463..a82a689df1 100644
--- a/.github/workflows/ms.authorization.policydefinitions.yml
+++ b/.github/workflows/ms.authorization.policydefinitions.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -121,7 +111,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -139,8 +129,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.authorization.policyexemptions.yml b/.github/workflows/ms.authorization.policyexemptions.yml
index b82bf43cb1..3401aef4d4 100644
--- a/.github/workflows/ms.authorization.policyexemptions.yml
+++ b/.github/workflows/ms.authorization.policyexemptions.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -121,7 +111,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -139,8 +129,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.authorization.policysetdefinitions.yml b/.github/workflows/ms.authorization.policysetdefinitions.yml
index 03a8600f58..36601975aa 100644
--- a/.github/workflows/ms.authorization.policysetdefinitions.yml
+++ b/.github/workflows/ms.authorization.policysetdefinitions.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -121,7 +111,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -139,8 +129,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.authorization.roleassignments.yml b/.github/workflows/ms.authorization.roleassignments.yml
index 84ff924fc1..d3428165a6 100644
--- a/.github/workflows/ms.authorization.roleassignments.yml
+++ b/.github/workflows/ms.authorization.roleassignments.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -121,7 +111,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -139,8 +129,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.authorization.roledefinitions.yml b/.github/workflows/ms.authorization.roledefinitions.yml
index d7d27995f6..f5d47a3eca 100644
--- a/.github/workflows/ms.authorization.roledefinitions.yml
+++ b/.github/workflows/ms.authorization.roledefinitions.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -121,7 +111,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -139,8 +129,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.automation.automationaccounts.yml b/.github/workflows/ms.automation.automationaccounts.yml
index a24d41f378..de23d01b00 100644
--- a/.github/workflows/ms.automation.automationaccounts.yml
+++ b/.github/workflows/ms.automation.automationaccounts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
 
   push:
     branches:
@@ -61,8 +53,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -118,7 +108,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -136,8 +126,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.batch.batchaccounts.yml b/.github/workflows/ms.batch.batchaccounts.yml
index df4a5c1384..4b4cf1c77c 100644
--- a/.github/workflows/ms.batch.batchaccounts.yml
+++ b/.github/workflows/ms.batch.batchaccounts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.cognitiveservices.accounts.yml b/.github/workflows/ms.cognitiveservices.accounts.yml
index 7b91ddfd51..e00c6c14ab 100644
--- a/.github/workflows/ms.cognitiveservices.accounts.yml
+++ b/.github/workflows/ms.cognitiveservices.accounts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.availabilitysets.yml b/.github/workflows/ms.compute.availabilitysets.yml
index 77c0db7418..4ffb24b91b 100644
--- a/.github/workflows/ms.compute.availabilitysets.yml
+++ b/.github/workflows/ms.compute.availabilitysets.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.diskencryptionsets.yml b/.github/workflows/ms.compute.diskencryptionsets.yml
index a54fdfc262..18273525c2 100644
--- a/.github/workflows/ms.compute.diskencryptionsets.yml
+++ b/.github/workflows/ms.compute.diskencryptionsets.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.disks.yml b/.github/workflows/ms.compute.disks.yml
index 1c0e4c4273..ec29541d6e 100644
--- a/.github/workflows/ms.compute.disks.yml
+++ b/.github/workflows/ms.compute.disks.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -123,7 +113,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -141,8 +131,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.galleries.yml b/.github/workflows/ms.compute.galleries.yml
index c52dc606a7..1c49f261ae 100644
--- a/.github/workflows/ms.compute.galleries.yml
+++ b/.github/workflows/ms.compute.galleries.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.images.yml b/.github/workflows/ms.compute.images.yml
index 3ad2be3a70..e24b0c91c3 100644
--- a/.github/workflows/ms.compute.images.yml
+++ b/.github/workflows/ms.compute.images.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.proximityplacementgroups.yml b/.github/workflows/ms.compute.proximityplacementgroups.yml
index a3f90fed37..b612899d4d 100644
--- a/.github/workflows/ms.compute.proximityplacementgroups.yml
+++ b/.github/workflows/ms.compute.proximityplacementgroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.virtualmachines.yml b/.github/workflows/ms.compute.virtualmachines.yml
index 3a7dbe9577..e8f4611ff0 100644
--- a/.github/workflows/ms.compute.virtualmachines.yml
+++ b/.github/workflows/ms.compute.virtualmachines.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -123,7 +113,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -141,8 +131,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.virtualmachinescalesets.yml b/.github/workflows/ms.compute.virtualmachinescalesets.yml
index 0dc7f6bc3e..52b3206888 100644
--- a/.github/workflows/ms.compute.virtualmachinescalesets.yml
+++ b/.github/workflows/ms.compute.virtualmachinescalesets.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -123,7 +113,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -141,8 +131,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.consumption.budgets.yml b/.github/workflows/ms.consumption.budgets.yml
index f63f71dfbe..d85f8dab21 100644
--- a/.github/workflows/ms.consumption.budgets.yml
+++ b/.github/workflows/ms.consumption.budgets.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.containerinstance.containergroups.yml b/.github/workflows/ms.containerinstance.containergroups.yml
index b6bcd16dda..80cf864795 100644
--- a/.github/workflows/ms.containerinstance.containergroups.yml
+++ b/.github/workflows/ms.containerinstance.containergroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.containerregistry.registries.yml b/.github/workflows/ms.containerregistry.registries.yml
index df366ce9f4..02d38dbb60 100644
--- a/.github/workflows/ms.containerregistry.registries.yml
+++ b/.github/workflows/ms.containerregistry.registries.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.containerservice.managedclusters.yml b/.github/workflows/ms.containerservice.managedclusters.yml
index 6e7c4a906f..3793998fd4 100644
--- a/.github/workflows/ms.containerservice.managedclusters.yml
+++ b/.github/workflows/ms.containerservice.managedclusters.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.databricks.workspaces.yml b/.github/workflows/ms.databricks.workspaces.yml
index 3ecc2e00c9..75c1e6310f 100644
--- a/.github/workflows/ms.databricks.workspaces.yml
+++ b/.github/workflows/ms.databricks.workspaces.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.datafactory.factories.yml b/.github/workflows/ms.datafactory.factories.yml
index 8aa7b4c55f..b3bcbef44f 100644
--- a/.github/workflows/ms.datafactory.factories.yml
+++ b/.github/workflows/ms.datafactory.factories.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
index 4d9a5d0668..c50c67edd3 100644
--- a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
+++ b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.desktopvirtualization.hostpools.yml b/.github/workflows/ms.desktopvirtualization.hostpools.yml
index c1afce8116..04444695f1 100644
--- a/.github/workflows/ms.desktopvirtualization.hostpools.yml
+++ b/.github/workflows/ms.desktopvirtualization.hostpools.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.desktopvirtualization.workspaces.yml b/.github/workflows/ms.desktopvirtualization.workspaces.yml
index eeccbf56d3..b4d454f7b5 100644
--- a/.github/workflows/ms.desktopvirtualization.workspaces.yml
+++ b/.github/workflows/ms.desktopvirtualization.workspaces.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.documentdb.databaseaccounts.yml b/.github/workflows/ms.documentdb.databaseaccounts.yml
index 2cd64d42b2..a2258daa82 100644
--- a/.github/workflows/ms.documentdb.databaseaccounts.yml
+++ b/.github/workflows/ms.documentdb.databaseaccounts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -122,7 +112,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -140,8 +130,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.eventgrid.topics.yml b/.github/workflows/ms.eventgrid.topics.yml
index 88ecf555c5..16577c641e 100644
--- a/.github/workflows/ms.eventgrid.topics.yml
+++ b/.github/workflows/ms.eventgrid.topics.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.eventhub.namespaces.yml b/.github/workflows/ms.eventhub.namespaces.yml
index 3f0679d64c..bc94aca9c5 100644
--- a/.github/workflows/ms.eventhub.namespaces.yml
+++ b/.github/workflows/ms.eventhub.namespaces.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.healthbot.healthbots.yml b/.github/workflows/ms.healthbot.healthbots.yml
index 2b154d9ae7..d6ef8d538f 100644
--- a/.github/workflows/ms.healthbot.healthbots.yml
+++ b/.github/workflows/ms.healthbot.healthbots.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.actiongroups.yml b/.github/workflows/ms.insights.actiongroups.yml
index 99cb72f9cc..3ee064898d 100644
--- a/.github/workflows/ms.insights.actiongroups.yml
+++ b/.github/workflows/ms.insights.actiongroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.activitylogalerts.yml b/.github/workflows/ms.insights.activitylogalerts.yml
index 643c9e00bb..472f182015 100644
--- a/.github/workflows/ms.insights.activitylogalerts.yml
+++ b/.github/workflows/ms.insights.activitylogalerts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.components.yml b/.github/workflows/ms.insights.components.yml
index 4f185a6bd4..66cdeeb807 100644
--- a/.github/workflows/ms.insights.components.yml
+++ b/.github/workflows/ms.insights.components.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.diagnosticsettings.yml b/.github/workflows/ms.insights.diagnosticsettings.yml
index 6e2e27d56c..708708a461 100644
--- a/.github/workflows/ms.insights.diagnosticsettings.yml
+++ b/.github/workflows/ms.insights.diagnosticsettings.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.metricalerts.yml b/.github/workflows/ms.insights.metricalerts.yml
index 89ab86e156..9434798839 100644
--- a/.github/workflows/ms.insights.metricalerts.yml
+++ b/.github/workflows/ms.insights.metricalerts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.privatelinkscopes.yml b/.github/workflows/ms.insights.privatelinkscopes.yml
index 0a91ffac05..8f31f1ac18 100644
--- a/.github/workflows/ms.insights.privatelinkscopes.yml
+++ b/.github/workflows/ms.insights.privatelinkscopes.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.scheduledqueryrules.yml b/.github/workflows/ms.insights.scheduledqueryrules.yml
index 20b7e8392f..078ca49024 100644
--- a/.github/workflows/ms.insights.scheduledqueryrules.yml
+++ b/.github/workflows/ms.insights.scheduledqueryrules.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.keyvault.vaults.yml b/.github/workflows/ms.keyvault.vaults.yml
index 46ba98a3bb..4ee1b01855 100644
--- a/.github/workflows/ms.keyvault.vaults.yml
+++ b/.github/workflows/ms.keyvault.vaults.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.logic.workflows.yml b/.github/workflows/ms.logic.workflows.yml
index 7fd65163ef..67f27defa3 100644
--- a/.github/workflows/ms.logic.workflows.yml
+++ b/.github/workflows/ms.logic.workflows.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.machinelearningservices.workspaces.yml b/.github/workflows/ms.machinelearningservices.workspaces.yml
index acf92354ea..cc4bff90e3 100644
--- a/.github/workflows/ms.machinelearningservices.workspaces.yml
+++ b/.github/workflows/ms.machinelearningservices.workspaces.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.managedidentity.userassignedidentities.yml b/.github/workflows/ms.managedidentity.userassignedidentities.yml
index 5e66123c3a..335e9f2c32 100644
--- a/.github/workflows/ms.managedidentity.userassignedidentities.yml
+++ b/.github/workflows/ms.managedidentity.userassignedidentities.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.managedservices.registrationdefinitions.yml b/.github/workflows/ms.managedservices.registrationdefinitions.yml
index ed2e6b251a..c10c63a605 100644
--- a/.github/workflows/ms.managedservices.registrationdefinitions.yml
+++ b/.github/workflows/ms.managedservices.registrationdefinitions.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'false' # Needs a custom removal script
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.management.managementgroups.yml b/.github/workflows/ms.management.managementgroups.yml
index 4f4740ec58..7d3784bb2a 100644
--- a/.github/workflows/ms.management.managementgroups.yml
+++ b/.github/workflows/ms.management.managementgroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.netapp.netappaccounts.yml b/.github/workflows/ms.netapp.netappaccounts.yml
index a351ec437d..b5f13d1740 100644
--- a/.github/workflows/ms.netapp.netappaccounts.yml
+++ b/.github/workflows/ms.netapp.netappaccounts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -122,7 +112,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -140,8 +130,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.applicationgateways.yml b/.github/workflows/ms.network.applicationgateways.yml
index 5e27aee802..da61df8ada 100644
--- a/.github/workflows/ms.network.applicationgateways.yml
+++ b/.github/workflows/ms.network.applicationgateways.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.applicationsecuritygroups.yml b/.github/workflows/ms.network.applicationsecuritygroups.yml
index 3220d97be9..d0302dc49b 100644
--- a/.github/workflows/ms.network.applicationsecuritygroups.yml
+++ b/.github/workflows/ms.network.applicationsecuritygroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.azurefirewalls.yml b/.github/workflows/ms.network.azurefirewalls.yml
index f7194ece26..6ff2187f56 100644
--- a/.github/workflows/ms.network.azurefirewalls.yml
+++ b/.github/workflows/ms.network.azurefirewalls.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.bastionhosts.yml b/.github/workflows/ms.network.bastionhosts.yml
index d3802c5198..49199a3b62 100644
--- a/.github/workflows/ms.network.bastionhosts.yml
+++ b/.github/workflows/ms.network.bastionhosts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.connections.yml b/.github/workflows/ms.network.connections.yml
index d1d0e16856..1f7bd38387 100644
--- a/.github/workflows/ms.network.connections.yml
+++ b/.github/workflows/ms.network.connections.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.ddosprotectionplans.yml b/.github/workflows/ms.network.ddosprotectionplans.yml
index f360394263..217af69256 100644
--- a/.github/workflows/ms.network.ddosprotectionplans.yml
+++ b/.github/workflows/ms.network.ddosprotectionplans.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.expressroutecircuits.yml b/.github/workflows/ms.network.expressroutecircuits.yml
index 6428263190..8026a0010e 100644
--- a/.github/workflows/ms.network.expressroutecircuits.yml
+++ b/.github/workflows/ms.network.expressroutecircuits.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.firewallpolicies.yml b/.github/workflows/ms.network.firewallpolicies.yml
index 2c4289c5e3..b66a3aae35 100644
--- a/.github/workflows/ms.network.firewallpolicies.yml
+++ b/.github/workflows/ms.network.firewallpolicies.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.ipgroups.yml b/.github/workflows/ms.network.ipgroups.yml
index 98d0118c9a..0b7cdffe9a 100644
--- a/.github/workflows/ms.network.ipgroups.yml
+++ b/.github/workflows/ms.network.ipgroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.loadbalancers.yml b/.github/workflows/ms.network.loadbalancers.yml
index bca15b1137..206b77a828 100644
--- a/.github/workflows/ms.network.loadbalancers.yml
+++ b/.github/workflows/ms.network.loadbalancers.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.localnetworkgateways.yml b/.github/workflows/ms.network.localnetworkgateways.yml
index e26905c703..0aa93f1006 100644
--- a/.github/workflows/ms.network.localnetworkgateways.yml
+++ b/.github/workflows/ms.network.localnetworkgateways.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.natgateways.yml b/.github/workflows/ms.network.natgateways.yml
index d352ecd81a..9753127888 100644
--- a/.github/workflows/ms.network.natgateways.yml
+++ b/.github/workflows/ms.network.natgateways.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.networksecuritygroups.yml b/.github/workflows/ms.network.networksecuritygroups.yml
index 306f26c6c3..6c061719d3 100644
--- a/.github/workflows/ms.network.networksecuritygroups.yml
+++ b/.github/workflows/ms.network.networksecuritygroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.networkwatchers.yml b/.github/workflows/ms.network.networkwatchers.yml
index d25883cd68..6603d81b95 100644
--- a/.github/workflows/ms.network.networkwatchers.yml
+++ b/.github/workflows/ms.network.networkwatchers.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'false' # Only one Network Watcher can exist in the same location. If removed, a default would be created in a dedicated RG
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.privatednszones.yml b/.github/workflows/ms.network.privatednszones.yml
index 30b4b40343..6fb7999da0 100644
--- a/.github/workflows/ms.network.privatednszones.yml
+++ b/.github/workflows/ms.network.privatednszones.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.privateendpoints.yml b/.github/workflows/ms.network.privateendpoints.yml
index 367bc6e000..a763997427 100644
--- a/.github/workflows/ms.network.privateendpoints.yml
+++ b/.github/workflows/ms.network.privateendpoints.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.publicipaddresses.yml b/.github/workflows/ms.network.publicipaddresses.yml
index 6ee854d3c4..cc04a1b8bc 100644
--- a/.github/workflows/ms.network.publicipaddresses.yml
+++ b/.github/workflows/ms.network.publicipaddresses.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.publicipprefixes.yml b/.github/workflows/ms.network.publicipprefixes.yml
index 7e1d703715..7b39bb27e0 100644
--- a/.github/workflows/ms.network.publicipprefixes.yml
+++ b/.github/workflows/ms.network.publicipprefixes.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.routetables.yml b/.github/workflows/ms.network.routetables.yml
index d7100ed1af..60cd70bb6b 100644
--- a/.github/workflows/ms.network.routetables.yml
+++ b/.github/workflows/ms.network.routetables.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.trafficmanagerprofiles.yml b/.github/workflows/ms.network.trafficmanagerprofiles.yml
index 209821688d..f8ef84847e 100644
--- a/.github/workflows/ms.network.trafficmanagerprofiles.yml
+++ b/.github/workflows/ms.network.trafficmanagerprofiles.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.virtualnetworkgateways.yml b/.github/workflows/ms.network.virtualnetworkgateways.yml
index 47301fe628..59c993d452 100644
--- a/.github/workflows/ms.network.virtualnetworkgateways.yml
+++ b/.github/workflows/ms.network.virtualnetworkgateways.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -118,7 +108,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -136,8 +126,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.virtualnetworks.yml b/.github/workflows/ms.network.virtualnetworks.yml
index e51326a5cb..6f9d64eb9f 100644
--- a/.github/workflows/ms.network.virtualnetworks.yml
+++ b/.github/workflows/ms.network.virtualnetworks.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.virtualwans.yml b/.github/workflows/ms.network.virtualwans.yml
index 175ca6164d..b07c7830f3 100644
--- a/.github/workflows/ms.network.virtualwans.yml
+++ b/.github/workflows/ms.network.virtualwans.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.operationalinsights.workspaces.yml b/.github/workflows/ms.operationalinsights.workspaces.yml
index 7ae7e29a29..38f6f69917 100644
--- a/.github/workflows/ms.operationalinsights.workspaces.yml
+++ b/.github/workflows/ms.operationalinsights.workspaces.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.recoveryservices.vaults.yml b/.github/workflows/ms.recoveryservices.vaults.yml
index 3a406e5d7c..9f193d19f7 100644
--- a/.github/workflows/ms.recoveryservices.vaults.yml
+++ b/.github/workflows/ms.recoveryservices.vaults.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.resources.deploymentscripts.yml b/.github/workflows/ms.resources.deploymentscripts.yml
index 9e970ccf82..4f84ff9c23 100644
--- a/.github/workflows/ms.resources.deploymentscripts.yml
+++ b/.github/workflows/ms.resources.deploymentscripts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.resources.resourcegroups.yml b/.github/workflows/ms.resources.resourcegroups.yml
index ed25ed95d0..ce6629020a 100644
--- a/.github/workflows/ms.resources.resourcegroups.yml
+++ b/.github/workflows/ms.resources.resourcegroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.security.azuresecuritycenter.yml b/.github/workflows/ms.security.azuresecuritycenter.yml
index 2c7741667e..20ced313d5 100644
--- a/.github/workflows/ms.security.azuresecuritycenter.yml
+++ b/.github/workflows/ms.security.azuresecuritycenter.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'false' # Needs custom removals script
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.servicebus.namespaces.yml b/.github/workflows/ms.servicebus.namespaces.yml
index bf74795531..bddc46f88d 100644
--- a/.github/workflows/ms.servicebus.namespaces.yml
+++ b/.github/workflows/ms.servicebus.namespaces.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.servicefabric.clusters.yml b/.github/workflows/ms.servicefabric.clusters.yml
index 0fca4bf2c6..9d70045af7 100644
--- a/.github/workflows/ms.servicefabric.clusters.yml
+++ b/.github/workflows/ms.servicefabric.clusters.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.sql.managedinstances.yml b/.github/workflows/ms.sql.managedinstances.yml
index 3a4a698aca..71b506438a 100644
--- a/.github/workflows/ms.sql.managedinstances.yml
+++ b/.github/workflows/ms.sql.managedinstances.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.sql.servers.yml b/.github/workflows/ms.sql.servers.yml
index 5c6a40a761..2ad9e1b9c5 100644
--- a/.github/workflows/ms.sql.servers.yml
+++ b/.github/workflows/ms.sql.servers.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml
index 68d7752ca0..aeb32ad24f 100644
--- a/.github/workflows/ms.storage.storageaccounts.yml
+++ b/.github/workflows/ms.storage.storageaccounts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -118,7 +108,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -136,8 +126,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.synapse.privatelinkhubs.yml b/.github/workflows/ms.synapse.privatelinkhubs.yml
index 87c364e9cf..83d9a99d31 100644
--- a/.github/workflows/ms.synapse.privatelinkhubs.yml
+++ b/.github/workflows/ms.synapse.privatelinkhubs.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,12 +125,11 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
           templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
           bicepRegistryName: '${{ env.bicepRegistryName }}'
           bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
+          bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
           bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'
diff --git a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
index fccf9a58a0..db4ea7e112 100644
--- a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
+++ b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.web.connections.yml b/.github/workflows/ms.web.connections.yml
index 52be65d0a0..c7abe83528 100644
--- a/.github/workflows/ms.web.connections.yml
+++ b/.github/workflows/ms.web.connections.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.web.hostingenvironments.yml b/.github/workflows/ms.web.hostingenvironments.yml
index 30e401d813..9a761c93c6 100644
--- a/.github/workflows/ms.web.hostingenvironments.yml
+++ b/.github/workflows/ms.web.hostingenvironments.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.web.serverfarms.yml b/.github/workflows/ms.web.serverfarms.yml
index 767f771543..58b32883b8 100644
--- a/.github/workflows/ms.web.serverfarms.yml
+++ b/.github/workflows/ms.web.serverfarms.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -117,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -135,8 +125,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.web.sites.yml b/.github/workflows/ms.web.sites.yml
index e2e62d0eac..21d15371aa 100644
--- a/.github/workflows/ms.web.sites.yml
+++ b/.github/workflows/ms.web.sites.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -60,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
@@ -123,7 +113,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -141,8 +131,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/arm/.global/global.module.tests.ps1 b/arm/.global/global.module.tests.ps1
index 9ae9a446b3..2d44d67cbe 100644
--- a/arm/.global/global.module.tests.ps1
+++ b/arm/.global/global.module.tests.ps1
@@ -51,6 +51,11 @@ Describe 'File/folder tests' -Tag Modules {
                 $true | Should -Be $true
             }
         }
+
+        It '[<moduleFolderName>] Module should contain a [version.json] file' -TestCases $moduleFolderTestCases {
+            param( [string] $moduleFolderPath )
+            (Test-Path (Join-Path -Path $moduleFolderPath 'version.json')) | Should -Be $true
+        }
     }
 
     Context '.parameters folder' {
diff --git a/arm/Microsoft.AnalysisServices/servers/version.json b/arm/Microsoft.AnalysisServices/servers/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.AnalysisServices/servers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/version.json b/arm/Microsoft.ApiManagement/service/apiVersionSets/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/apiVersionSets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/version.json b/arm/Microsoft.ApiManagement/service/apis/policies/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/apis/policies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/apis/version.json b/arm/Microsoft.ApiManagement/service/apis/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/apis/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/version.json b/arm/Microsoft.ApiManagement/service/authorizationServers/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/authorizationServers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/backends/version.json b/arm/Microsoft.ApiManagement/service/backends/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/backends/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/caches/version.json b/arm/Microsoft.ApiManagement/service/caches/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/caches/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/version.json b/arm/Microsoft.ApiManagement/service/identityProviders/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/identityProviders/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/namedValues/version.json b/arm/Microsoft.ApiManagement/service/namedValues/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/namedValues/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/policies/version.json b/arm/Microsoft.ApiManagement/service/policies/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/policies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/version.json b/arm/Microsoft.ApiManagement/service/portalsettings/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/portalsettings/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/products/apis/version.json b/arm/Microsoft.ApiManagement/service/products/apis/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/products/apis/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/products/groups/version.json b/arm/Microsoft.ApiManagement/service/products/groups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/products/groups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/products/version.json b/arm/Microsoft.ApiManagement/service/products/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/products/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/version.json b/arm/Microsoft.ApiManagement/service/subscriptions/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/subscriptions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ApiManagement/service/version.json b/arm/Microsoft.ApiManagement/service/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Authorization/policyAssignments/version.json b/arm/Microsoft.Authorization/policyAssignments/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Authorization/policyAssignments/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Authorization/policyDefinitions/version.json b/arm/Microsoft.Authorization/policyDefinitions/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Authorization/policyDefinitions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Authorization/policyExemptions/version.json b/arm/Microsoft.Authorization/policyExemptions/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Authorization/policyExemptions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/version.json b/arm/Microsoft.Authorization/policySetDefinitions/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Authorization/policySetDefinitions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Authorization/roleAssignments/version.json b/arm/Microsoft.Authorization/roleAssignments/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Authorization/roleAssignments/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Authorization/roleDefinitions/version.json b/arm/Microsoft.Authorization/roleDefinitions/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Authorization/roleDefinitions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json b/arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/modules/version.json b/arm/Microsoft.Automation/automationAccounts/modules/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/modules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/version.json b/arm/Microsoft.Automation/automationAccounts/runbooks/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/runbooks/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/version.json b/arm/Microsoft.Automation/automationAccounts/schedules/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/schedules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/variables/version.json b/arm/Microsoft.Automation/automationAccounts/variables/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/variables/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/version.json b/arm/Microsoft.Automation/automationAccounts/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Batch/batchAccounts/version.json b/arm/Microsoft.Batch/batchAccounts/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Batch/batchAccounts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.CognitiveServices/accounts/version.json b/arm/Microsoft.CognitiveServices/accounts/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.CognitiveServices/accounts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Compute/availabilitySets/version.json b/arm/Microsoft.Compute/availabilitySets/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Compute/availabilitySets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/version.json b/arm/Microsoft.Compute/diskEncryptionSets/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Compute/diskEncryptionSets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Compute/disks/version.json b/arm/Microsoft.Compute/disks/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Compute/disks/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Compute/galleries/images/version.json b/arm/Microsoft.Compute/galleries/images/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Compute/galleries/images/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Compute/galleries/version.json b/arm/Microsoft.Compute/galleries/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Compute/galleries/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Compute/images/version.json b/arm/Microsoft.Compute/images/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Compute/images/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/version.json b/arm/Microsoft.Compute/proximityPlacementGroups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Compute/proximityPlacementGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json b/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/version.json b/arm/Microsoft.Compute/virtualMachineScaleSets/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Compute/virtualMachineScaleSets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Compute/virtualMachines/extensions/version.json b/arm/Microsoft.Compute/virtualMachines/extensions/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Compute/virtualMachines/extensions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Compute/virtualMachines/version.json b/arm/Microsoft.Compute/virtualMachines/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Compute/virtualMachines/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Consumption/budgets/version.json b/arm/Microsoft.Consumption/budgets/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Consumption/budgets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ContainerInstance/containerGroups/version.json b/arm/Microsoft.ContainerInstance/containerGroups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ContainerInstance/containerGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ContainerRegistry/registries/version.json b/arm/Microsoft.ContainerRegistry/registries/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ContainerRegistry/registries/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ContainerService/managedClusters/agentPools/version.json b/arm/Microsoft.ContainerService/managedClusters/agentPools/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ContainerService/managedClusters/agentPools/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ContainerService/managedClusters/version.json b/arm/Microsoft.ContainerService/managedClusters/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ContainerService/managedClusters/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.DataFactory/factories/integrationRuntime/version.json b/arm/Microsoft.DataFactory/factories/integrationRuntime/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.DataFactory/factories/integrationRuntime/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json b/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.DataFactory/factories/version.json b/arm/Microsoft.DataFactory/factories/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.DataFactory/factories/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Databricks/workspaces/version.json b/arm/Microsoft.Databricks/workspaces/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Databricks/workspaces/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json b/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/version.json b/arm/Microsoft.DesktopVirtualization/applicationgroups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.DesktopVirtualization/applicationgroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/version.json b/arm/Microsoft.DesktopVirtualization/hostpools/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.DesktopVirtualization/hostpools/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/version.json b/arm/Microsoft.DesktopVirtualization/workspaces/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.DesktopVirtualization/workspaces/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.EventGrid/topics/version.json b/arm/Microsoft.EventGrid/topics/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.EventGrid/topics/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.EventHub/namespaces/authorizationRules/version.json b/arm/Microsoft.EventHub/namespaces/authorizationRules/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.EventHub/namespaces/authorizationRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json b/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json b/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json b/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/version.json b/arm/Microsoft.EventHub/namespaces/eventhubs/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.EventHub/namespaces/eventhubs/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.EventHub/namespaces/version.json b/arm/Microsoft.EventHub/namespaces/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.EventHub/namespaces/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.HealthBot/healthBots/version.json b/arm/Microsoft.HealthBot/healthBots/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.HealthBot/healthBots/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Insights/actionGroups/version.json b/arm/Microsoft.Insights/actionGroups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Insights/actionGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Insights/activityLogAlerts/version.json b/arm/Microsoft.Insights/activityLogAlerts/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Insights/activityLogAlerts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Insights/components/version.json b/arm/Microsoft.Insights/components/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Insights/components/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Insights/diagnosticSettings/version.json b/arm/Microsoft.Insights/diagnosticSettings/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Insights/diagnosticSettings/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Insights/metricAlerts/version.json b/arm/Microsoft.Insights/metricAlerts/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Insights/metricAlerts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Insights/privateLinkScopes/version.json b/arm/Microsoft.Insights/privateLinkScopes/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Insights/privateLinkScopes/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/version.json b/arm/Microsoft.Insights/scheduledQueryRules/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Insights/scheduledQueryRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/version.json b/arm/Microsoft.KeyVault/vaults/accessPolicies/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.KeyVault/vaults/accessPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.KeyVault/vaults/keys/version.json b/arm/Microsoft.KeyVault/vaults/keys/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.KeyVault/vaults/keys/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/version.json b/arm/Microsoft.KeyVault/vaults/secrets/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.KeyVault/vaults/secrets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.KeyVault/vaults/version.json b/arm/Microsoft.KeyVault/vaults/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.KeyVault/vaults/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Logic/workflows/version.json b/arm/Microsoft.Logic/workflows/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Logic/workflows/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/version.json b/arm/Microsoft.MachineLearningServices/workspaces/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.MachineLearningServices/workspaces/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/version.json b/arm/Microsoft.ManagedServices/registrationDefinitions/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ManagedServices/registrationDefinitions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Management/managementGroups/version.json b/arm/Microsoft.Management/managementGroups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Management/managementGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.NetApp/netAppAccounts/version.json b/arm/Microsoft.NetApp/netAppAccounts/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.NetApp/netAppAccounts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/applicationGateways/version.json b/arm/Microsoft.Network/applicationGateways/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/applicationGateways/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/applicationSecurityGroups/version.json b/arm/Microsoft.Network/applicationSecurityGroups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/applicationSecurityGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/azureFirewalls/version.json b/arm/Microsoft.Network/azureFirewalls/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/azureFirewalls/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/bastionHosts/version.json b/arm/Microsoft.Network/bastionHosts/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/bastionHosts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/connections/version.json b/arm/Microsoft.Network/connections/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/connections/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/ddosProtectionPlans/version.json b/arm/Microsoft.Network/ddosProtectionPlans/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/ddosProtectionPlans/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/expressRouteCircuits/version.json b/arm/Microsoft.Network/expressRouteCircuits/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/expressRouteCircuits/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/firewallPolicies/ruleGroups/version.json b/arm/Microsoft.Network/firewallPolicies/ruleGroups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/firewallPolicies/ruleGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/firewallPolicies/version.json b/arm/Microsoft.Network/firewallPolicies/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/firewallPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/ipGroups/version.json b/arm/Microsoft.Network/ipGroups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/ipGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json b/arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json b/arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/loadBalancers/version.json b/arm/Microsoft.Network/loadBalancers/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/loadBalancers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/localNetworkGateways/version.json b/arm/Microsoft.Network/localNetworkGateways/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/localNetworkGateways/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/natGateways/version.json b/arm/Microsoft.Network/natGateways/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/natGateways/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/networkSecurityGroups/version.json b/arm/Microsoft.Network/networkSecurityGroups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/networkSecurityGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json b/arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/version.json b/arm/Microsoft.Network/networkWatchers/flowLogs/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/networkWatchers/flowLogs/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/networkWatchers/version.json b/arm/Microsoft.Network/networkWatchers/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/networkWatchers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/privateDnsZones/version.json b/arm/Microsoft.Network/privateDnsZones/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/privateDnsZones/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/privateEndpoints/version.json b/arm/Microsoft.Network/privateEndpoints/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/privateEndpoints/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/publicIPAddresses/version.json b/arm/Microsoft.Network/publicIPAddresses/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/publicIPAddresses/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/publicIPPrefixes/version.json b/arm/Microsoft.Network/publicIPPrefixes/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/publicIPPrefixes/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/routeTables/version.json b/arm/Microsoft.Network/routeTables/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/routeTables/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/version.json b/arm/Microsoft.Network/trafficmanagerprofiles/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/trafficmanagerprofiles/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/version.json b/arm/Microsoft.Network/virtualNetworkGateways/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/virtualNetworkGateways/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/version.json b/arm/Microsoft.Network/virtualNetworks/subnets/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/virtualNetworks/subnets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/virtualNetworks/version.json b/arm/Microsoft.Network/virtualNetworks/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/virtualNetworks/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Network/virtualWans/version.json b/arm/Microsoft.Network/virtualWans/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Network/virtualWans/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json b/arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json b/arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json b/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.OperationalInsights/workspaces/version.json b/arm/Microsoft.OperationalInsights/workspaces/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.OperationalInsights/workspaces/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json b/arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json b/arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json b/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json b/arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.RecoveryServices/vaults/version.json b/arm/Microsoft.RecoveryServices/vaults/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.RecoveryServices/vaults/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Resources/deploymentScripts/version.json b/arm/Microsoft.Resources/deploymentScripts/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Resources/deploymentScripts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Resources/resourceGroups/version.json b/arm/Microsoft.Resources/resourceGroups/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Resources/resourceGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Security/azureSecurityCenter/version.json b/arm/Microsoft.Security/azureSecurityCenter/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Security/azureSecurityCenter/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json b/arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json b/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json b/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json b/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json b/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/version.json b/arm/Microsoft.ServiceBus/namespaces/queues/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/queues/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/version.json b/arm/Microsoft.ServiceBus/namespaces/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json b/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/version.json b/arm/Microsoft.ServiceFabric/clusters/applicationTypes/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ServiceFabric/clusters/applicationTypes/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.ServiceFabric/clusters/version.json b/arm/Microsoft.ServiceFabric/clusters/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.ServiceFabric/clusters/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/administrators/version.json b/arm/Microsoft.Sql/managedInstances/administrators/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/administrators/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json b/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json b/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/databases/version.json b/arm/Microsoft.Sql/managedInstances/databases/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/databases/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json b/arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/keys/version.json b/arm/Microsoft.Sql/managedInstances/keys/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/keys/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json b/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/version.json b/arm/Microsoft.Sql/managedInstances/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json b/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Sql/servers/databases/version.json b/arm/Microsoft.Sql/servers/databases/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Sql/servers/databases/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Sql/servers/firewallRules/version.json b/arm/Microsoft.Sql/servers/firewallRules/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Sql/servers/firewallRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Sql/servers/securityAlertPolicies/version.json b/arm/Microsoft.Sql/servers/securityAlertPolicies/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Sql/servers/securityAlertPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Sql/servers/version.json b/arm/Microsoft.Sql/servers/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Sql/servers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/blobServices/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json b/arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/version.json b/arm/Microsoft.Storage/storageAccounts/fileServices/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/fileServices/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json b/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/version.json b/arm/Microsoft.Storage/storageAccounts/queueServices/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/queueServices/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/version.json b/arm/Microsoft.Storage/storageAccounts/tableServices/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/version.json b/arm/Microsoft.Storage/storageAccounts/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/version.json b/arm/Microsoft.Synapse/privateLinkHubs/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Synapse/privateLinkHubs/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/version.json b/arm/Microsoft.VirtualMachineImages/imageTemplates/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.VirtualMachineImages/imageTemplates/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Web/connections/version.json b/arm/Microsoft.Web/connections/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Web/connections/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Web/hostingEnvironments/version.json b/arm/Microsoft.Web/hostingEnvironments/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Web/hostingEnvironments/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Web/serverfarms/version.json b/arm/Microsoft.Web/serverfarms/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Web/serverfarms/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Web/sites/config/version.json b/arm/Microsoft.Web/sites/config/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Web/sites/config/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/arm/Microsoft.Web/sites/version.json b/arm/Microsoft.Web/sites/version.json
new file mode 100644
index 0000000000..56f8d9ca40
--- /dev/null
+++ b/arm/Microsoft.Web/sites/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4"
+}
diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md
index 1961d30fef..e96b22dd63 100644
--- a/docs/wiki/PipelinesDesign.md
+++ b/docs/wiki/PipelinesDesign.md
@@ -34,6 +34,7 @@ This section gives you an overview of the design principals the pipelines follow
     - [Component: Variable file](#azure-devops-component-variable-file)
     - [Component: Pipeline templates](#azure-devops-component-pipeline-templates)
     - [Component: Pipelines](#azure-devops-component-pipelines)
+
 ---
 
 # Module Pipelines
@@ -47,6 +48,7 @@ This section will give you an overview of the different phases and shared logic
 ## Module pipeline inputs
 
 Note that the pipeline comes with 4 runtime parameters you can provide when you trigger it:
+
 - `'Branch' dropdown`: A dropdown to select the branch to run the pipeline from
 - `'Remove module' switch`: Can be set to 'true' or 'false' and controls whether the test-deployed resources are removed after testing
 - `Versioning mode`: This option allows you to control the publishing behavior. Depending on the mode you select, a different part of the version is incremented (for example [major|minor|patch]), if no custom version is provided. For further information of how the input is processed see [publishing](#publish).
@@ -99,23 +101,60 @@ For additional details on how removal works please refer to the dedicated [Remov
 
 ### Publish
 
-The publish phase concludes each module's pipeline. If all previous tests succeeded (i.e. no phase failed) and the pipeline was executed in the [main\|master] branch, a new module version is published to all configured target locations. Currently we support
+The publish phase concludes each module's pipeline. If all previous tests succeeded (i.e. no phase failed) and the pipeline was executed in the `main` or `master` branch, a new module version is published to all configured target locations. Currently we support the following target locations:
+
 - _template specs_
 - _private bicep registry_
 - _universal artifacts_ (_Azure DevOps_ only)
 
-By the time of this writing, the publishing experience works as follows:
-1. A user can optionally specify a version in the module's pipeline file, or during runtime. If the user does not, a default version is used
-1. No matter what publishing location we enabled, the corresponding logic will
-   1. Fetch the latest version of this module in the target location (if available)
-   1. Compare it with any specified custom version the user optionally provided
-      - If the custom version is higher, it is used going forward
-      - If it is lower, the fallback mechanism will select a new version based on some default behavior (e.g. increment to the next patch version)
-   1. The identified new version is then used to publish the module to the target location in question
+Besides the execution of a publish, there is also the possibility to set the switch `Publish prerelease module`. This switch makes it possible to publish a pre-release version in every workflow run that is not based on main or master.
+
+> **Note**<br>
+> The `version` used for publishing any artifact will be the same in all three target locations which reduces the maintenance effort.
+
+The publishing works as follows:
+
+1. The script `utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1` gets all changed module files including child modules and handles the logic of propagating the appropriate module version to be used:
+   1. The major (`x.0`) and minor (`0.x`) version are set based on the file `version.json` in the module folder.
+   1. The patch (`0.0.x`) version is calculated based on the number of commits on the `HEAD` ref. This will cause the patch version to never reset to 0 with major and/or minor increment, as specified for [semver](https://semver.org/).
+
+**Example scenario**
+
+Lets look at an example run where we would do a patch change on the `fileShares` module:
+1. A new branch is created for further development of the `fileShare` module. Let's assume the new branch started from commit `500` on the default branch and the `version.json` of the `fileShare` module contains major and minor `0.3`.
+2. Bug-fixes, documentation, and security updates are added to the `fileShare` module by the author. The `version.json` file is not changed in either the child or parent module folders.
+3. The author runs a manual workflow based on their development branch, with the 'publish pre-release' option enabled.
+4. A prerelease run of publishing triggers after test and validation of the module.
+   - For the child and parent modules, the module version's major and minor version is read from the `version.json` file in the module folder respectively. Being unchanged, it still contains the version `0.3`.
+   - The patch is calculated based on the total number of commits in history on the branch (independent on the module). The new branch started from commit `500` on the default branch and 1 commit has been pushed, so the total number of commits on the new branch is `501`.
+   - As the pipeline is not running based on the 'default branch', a prerelease segment (`-prerelease`) is added to the version.
+   - The version results in being `0.3.501-prerelease`. The child and parent modules may have different major and minor versions, but the patch version will be the same in this case. Other unmodified child modules of `storageAccount` will not be republished and remain with the existing version.
+5. Sequential commits on the branch and runs of the module pipeline, with the 'publish pre-release' option enabled results in the following versions being published:
+   - `0.3.502-prerelease`
+   - `0.3.503-prerelease`
+   - ...
+   - `0.3.506-prerelease`
+6. When the branch is merged to the default branch, the only thing that changes is the patch version and the removal of the `-prerelease` segment.
+   - The number of commits will at this point be calculated based on the number of commits on the default branch.
+   - Assuming the development branch started from commit 500 on the default branch, and the author added 6 commits on the development branch, the prerelease versions will reach `0.3.506-prerelease`.
+   - Meanwhile, there can be changes (let's say 2 squashed PR merges) on the default branch that is pushing its number of commits in history further.
+   - If the PR for the changes to `fileShare` is squash merged as commit number 503, the patch version on the child and parent module is then `503`, resulting in a version `0.3.503` being published.
+
+```
+                  \         \
+C499 -> C500 ---> C501 ---> C502 ---> C503 (503)
+        \                            /
+         D1 --> D2 --> D3 ... --> D6
+        (501)  (502)  (503)      (506)
+```
+`Cx` - Commits on main,
+`Dx` - Commits on development branch,
+`(x)` - Calculated patch version
 
 ## Shared concepts
 
 There are several concepts that are shared among the phases. Most notably
+
 - [Prerequisites](#prerequisites)
 - [Pipeline secrets](#pipeline-serets)
 - [Pipeline variables](#pipeline-variables)
@@ -124,6 +163,7 @@ There are several concepts that are shared among the phases. Most notably
 ### Prerequisites
 
 For both the [simulated deployment validation](#simulated-deployment-validation) as well as the [test deployment](#test-deployment) we should account for the following prerequisites:
+
 - A _"Sandbox"_ or _"Engineering"_ **validation subscription** (in Azure) has to be used to test if the modules (or other components) are deployable. This subscription must not have connectivity to any on-premises or other Azure networks.
 - An Azure Active Directory [service principal](https://docs.microsoft.com/en-us/azure/active-directory/develop/app-objects-and-service-principals#service-principal-object) (AAD SPN) to authenticate to the validation subscription and run the test deployments of the modules.
 
@@ -144,13 +184,15 @@ The location where to set these secrets up depends on the DevOps platform you us
 
 The primary pipeline variable file hosts the fundamental pipeline configuration and is stored in a different location, based on the [DevOps platform](#devops-tool-specific-considerations). In here you will find and can configure information such as:
 
-#### ***General***
+#### **_General_**
+
 | Variable Name | Example Value | Description |
 | - | - | - |
 | `defaultLocation` | "WestEurope" | The default location to deploy resources to. If no location is specified in the deploying parameter file, this location is used |
 | `resourceGroupName` | "validation-rg" | The resource group to deploy all resources for validation to |
 
-#### ***Template-specs specific (publishing)***
+#### **_Template-specs specific (publishing)_**
+
 | Variable Name | Example Value | Description |
 | - | - | - |
 | `templateSpecsRGName` | "artifacts-rg" | The resource group to host the created template-specs |
@@ -158,7 +200,8 @@ The primary pipeline variable file hosts the fundamental pipeline configuration
 | `templateSpecsDescription` | "This is a module from the [Common Azure Resource Modules Library]" | A description to add to the published template specs |
 | `templateSpecsDoPublish` | "true" | A central switch to enable/disable publishing to template-specs |
 
-#### ***Private bicep registry specific (publishing)***
+#### **_Private bicep registry specific (publishing)_**
+
 | Variable Name | Example Value | Description |
 | - | - | - |
 | `bicepRegistryName` | "adpsxxazacrx001" | The container registry to publish bicep templates to |
@@ -193,6 +236,7 @@ As the modules we test often times have dependencies to other services, we creat
 ### Dependencies pipeline inputs
 
 Note that the pipeline comes with 2 runtime parameters you can provide when you trigger it:
+
 - `'Branch' dropdown`: A dropdown to select the branch to run the pipeline from
 - `'Enable SQL MI dependency deployment' switch`: Can be set to 'true' or 'false' and controls whether the dependencies for the SQL-MI are deployed during execution or not
 
@@ -220,6 +264,7 @@ Depending on what DevOps tool you want to use to host the platform you will find
 ## GitHub Workflows
 
 [GitHub actions & workflows](https://docs.github.com/en/actions) are the CI/CD solution provided by GitHub. To get the platform going, we use the following elements:
+
 - **[GitHub secrets:](#github-component-github-secrets)** We leverage GitHub repository secrets to store central and potentially sensitive information we need to perform deployments and other platform specific actions
 - **[Variable file:](#github-component-variable-file)** This file contains the configuration for all module pipelines in this repository.
 - **[Composite actions:](#github-component-composite-actions)** Composite actions bundle a set of actions for a specific purpose together. They are referenced by module pipelines.
@@ -235,14 +280,14 @@ For _GitHub_ in particular we need the following secrets in addition to those de
 
 | Secret Name | Example | Description |
 | - | - | - |
-| `AZURE_CREDENTIALS` |  `{"clientId": "4ce8ce4c-cac0-48eb-b815-65e5763e2929", "clientSecret": "<placeholder>", "subscriptionId": "d0312b25-9160-4550-914f-8738d9b5caf5", "tenantId": "9734cec9-4384-445b-bbb6-767e7be6e5ec" }` | The login credentials of the [deployment principal](./GettingStarted#platform-principal) to use to log into the target Azure environment to test in. The format is described [here](https://github.com/Azure/login#configure-deployment-credentials). |
+| `AZURE_CREDENTIALS` | `{"clientId": "4ce8ce4c-cac0-48eb-b815-65e5763e2929", "clientSecret": "<placeholder>", "subscriptionId": "d0312b25-9160-4550-914f-8738d9b5caf5", "tenantId": "9734cec9-4384-445b-bbb6-767e7be6e5ec" }` | The login credentials of the [deployment principal](./GettingStarted#platform-principal) to use to log into the target Azure environment to test in. The format is described [here](https://github.com/Azure/login#configure-deployment-credentials). |
 | `PLATFORM_REPO_UPDATE_PAT` | `<placeholder>` | A PAT with enough permissions assigned to it to push into the main branch. This PAT is leveraged by pipelines that automatically generate ReadMe files to keep them up to date |
 
 ### **GitHub Component:** Variable file
 
 The [pipeline configuration file](#pipeline-variables) can be found at `.github/variables/global.variables.json`.
 
-### **GitHub Component:** Composite Actions**
+### **GitHub Component:** Composite Actions
 
 We use several composite actions to perform various tasks shared by our module workflows:
 
@@ -259,7 +304,7 @@ These are the individual end-to-end workflows we have for each module. Leveragin
 
 Comparing multiple workflows you'll notice they are almost identical, yet differ in a few important areas:
 
-- The ***[path filters](https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions)*** of the workflow trigger:
+- The **_[path filters](https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions)_** of the workflow trigger:
   | Purpose | Example |
   | - | - |
   | Include the composite actions | `- '.github/actions/templates/**'` |
@@ -268,17 +313,19 @@ Comparing multiple workflows you'll notice they are almost identical, yet differ
   | Exclude any ReadMe | `- '!*/**/readme.md'` |
 
   Full example
+
   ```yaml
-    push:
-      branches:
-        - main
-      paths:
-        - '.github/actions/templates/**'
-        - '.github/workflows/ms.network.virtualwans.yml'
-        - 'arm/Microsoft.Network/virtualWans/**'
-        - '!arm/Microsoft.Network/virtualWans/readme.md'
+  push:
+    branches:
+      - main
+    paths:
+      - '.github/actions/templates/**'
+      - '.github/workflows/ms.network.virtualwans.yml'
+      - 'arm/Microsoft.Network/virtualWans/**'
+      - '!arm/Microsoft.Network/virtualWans/readme.md'
   ```
-- The ***environment variables***
+
+- The **_environment variables_**
   The environment variables are leveraged by the workflow to fundamentally process the module. We need:
   | Variable | Description | Example |
   | - | - | - |
@@ -286,6 +333,7 @@ Comparing multiple workflows you'll notice they are almost identical, yet differ
   | `workflowPath` | Relative path to the workflow itself | `workflowPath: '.github/workflows/ms.network.virtualwans.yml'` |
 
   Full example
+
   ```yaml
   env:
     modulePath: 'arm/Microsoft.Network/virtualWans'
@@ -353,8 +401,8 @@ These are the individual end-to-end pipelines we have for each module. Leveragin
 
 While they look very similar they have specific areas in which they differ:
 
-- The ***path filters*** of the pipeline trigger:
-   Purpose | Example |
+- The **_path filters_** of the pipeline trigger:
+  | Purpose | Example |
   | - | - |
   | Include the templates | `- '/.azuredevops/pipelineTemplates/module.*.yml'` |
   | Include the relative path to the pipeline itself | `- '/.azuredevops/modulePipelines/ms.analysisservices.servers.yml' ` |
@@ -362,22 +410,25 @@ While they look very similar they have specific areas in which they differ:
   | Exclude any readme | `- '/**/*.md'` |
 
   Full example:
+
   ```yaml
-    trigger:
-      batch: true
-      branches:
-        include:
-          - main
-      paths:
-        include:
-          - '/.azuredevops/modulePipelines/ms.analysisservices.servers.yml'
-          - '/.azuredevops/pipelineTemplates/module.*.yml'
-          - '/arm/Microsoft.AnalysisServices/servers/*'
-        exclude:
-          - '/**/*.md'
+  trigger:
+    batch: true
+    branches:
+      include:
+        - main
+    paths:
+      include:
+        - '/.azuredevops/modulePipelines/ms.analysisservices.servers.yml'
+        - '/.azuredevops/pipelineTemplates/module.*.yml'
+        - '/arm/Microsoft.AnalysisServices/servers/*'
+      exclude:
+        - '/**/*.md'
   ```
-  > ***Note:*** By the time of this writing, wildcards are temporarily not supported by Azure DevOps
-- The ***variables***
+
+  > **_Note:_** By the time of this writing, wildcards are temporarily not supported by Azure DevOps
+
+- The **_variables_**
   The variables are leveraged by the pipelines to fundamentally process the module. We need:
   | Variable | Description | Example |
   | - | - | - |
@@ -386,12 +437,13 @@ While they look very similar they have specific areas in which they differ:
   | `modulePath` | Relative path to the module folder | <code>- name: modulePath<p>&nbsp;&nbsp;value: '/arm/Microsoft.AnalysisServices/servers'</code> |
 
   Full example:
+
   ```yaml
-    variables:
-      - template: '/.azuredevops/pipelineVariables/global.variables.yml'
-      - group: 'PLATFORM_VARIABLES'
-      - name: modulePath
-        value: '/arm/Microsoft.AnalysisServices/servers'
+  variables:
+    - template: '/.azuredevops/pipelineVariables/global.variables.yml'
+    - group: 'PLATFORM_VARIABLES'
+    - name: modulePath
+      value: '/arm/Microsoft.AnalysisServices/servers'
   ```
 
 #### Azure DevOps Artifacts
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
new file mode 100644
index 0000000000..5bc3ca2381
--- /dev/null
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -0,0 +1,426 @@
+#region Helper functions
+
+<#
+.SYNOPSIS
+Get modified files between two commits.
+
+.PARAMETER Commit
+Optional. A git reference to base the comparison on.
+
+.PARAMETER CompareCommit
+Optional. A git reference to compare with.
+
+.EXAMPLE
+Get-ModifiedFileList -Commit "HEAD^" -CompareCommit "HEAD"
+
+    Directory: C:\Repo\Azure\ResourceModules\utilities\pipelines\resourcePublish
+
+Mode                 LastWriteTime         Length Name
+----                 -------------         ------ ----
+la---          08.12.2021    15:50           7133 Script.ps1
+
+Get modified files between previous and current commit.
+#>
+function Get-ModifiedFileList {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $false)]
+        [string] $Commit = 'HEAD',
+
+        [Parameter(Mandatory = $false)]
+        [string] $CompareCommit = 'HEAD^'
+    )
+
+    Write-Verbose "Gathering modified files between [$Commit] and [$CompareCommit]" -Verbose
+    $Diff = git diff --name-only --diff-filter=AM $Commit $CompareCommit
+    $ModifiedFiles = $Diff | Get-Item
+    Write-Verbose 'The following files have been modified:' -Verbose
+    $ModifiedFiles | ForEach-Object {
+        Write-Verbose (' - [{0}]' -f $_.FullName) -Verbose
+    }
+
+    return $ModifiedFiles
+}
+
+<#
+.SYNOPSIS
+Get the name of the current checked out branch.
+
+.DESCRIPTION
+Get the name of the current checked out branch. If git cannot find it, best effort based on environment variables is used.
+
+.EXAMPLE
+Get-CurrentBranch
+
+feature-branch-1
+
+Get the name of the current checked out branch.
+
+#>
+function Get-GitBranchName {
+    [CmdletBinding()]
+    param ()
+
+    # Get branch name from Git
+    try {
+        Write-Verbose "Git: Using git command 'git branch --show-current'" -Verbose
+        $BranchName = git branch --show-current
+    } catch {
+        Write-Verbose 'Git: No name found.' -Verbose
+    }
+
+    # If git could not get name, try GitHub variable
+    if ([string]::IsNullOrEmpty($BranchName) -and (Test-Path env:GITHUB_REF_NAME)) {
+        Write-Verbose "GitHub: Using environment variable 'GITHUB_REF_NAME': [$env:GITHUB_REF_NAME]" -Verbose
+        $BranchName = $env:GITHUB_REF_NAME
+    }
+
+    # If git could not get name, try Azure DevOps variable
+    if ([string]::IsNullOrEmpty($BranchName) -and (Test-Path env:BUILD_SOURCEBRANCHNAME)) {
+        Write-Verbose "Azure DevOps: Using environment variable 'BUILD_SOURCEBRANCHNAME': [$env:BUILD_SOURCEBRANCHNAME]" -Verbose
+        $BranchName = $env:BUILD_SOURCEBRANCHNAME
+    }
+
+    return $BranchName
+}
+
+<#
+.SYNOPSIS
+Find the closest deploy.bicep/json file to the current directory/file.
+
+.DESCRIPTION
+This function will search the current directory and all parent directories for a deploy.bicep/json file.
+
+.PARAMETER Path
+Mandatory. Path to the folder/file that should be searched
+
+.EXAMPLE
+Find-TemplateFile -Path "C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\.bicep\nested_cuaId.bicep"
+
+    Directory: C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables
+
+Mode                 LastWriteTime         Length Name
+----                 -------------         ------ ----
+la---          05.12.2021    22:45           1230 deploy.bicep
+
+Gets the closest deploy.bicep/json file to the current directory.
+#>
+function Find-TemplateFile {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $Path
+    )
+
+    $FolderPath = Split-Path $Path -Parent
+    $FolderName = Split-Path $Path -Leaf
+    if ($FolderName -eq 'arm') {
+        return $null
+    }
+
+    #Prioritizing the bicep file
+    $TemplateFilePath = Join-Path -Path $FolderPath -ChildPath 'deploy.bicep'
+    if (-not (Test-Path $TemplateFilePath)) {
+        $TemplateFilePath = Join-Path -Path $FolderPath -ChildPath 'deploy.json'
+    }
+
+    if (-not (Test-Path $TemplateFilePath)) {
+        return Find-TemplateFile -Path $FolderPath
+    }
+
+    return $TemplateFilePath | Get-Item
+}
+
+<#
+.SYNOPSIS
+Find the closest deploy.bicep/json file to the changed files in the module folder structure.
+
+.DESCRIPTION
+Find the closest deploy.bicep/json file to the changed files in the module folder structure.
+
+.PARAMETER ModuleFolderPath
+Mandatory. Path to the main/parent module folder.
+
+.EXAMPLE
+Get-TemplateFileToUpdate -ModuleFolderPath "C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\"
+
+C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep
+
+Gets the closest deploy.bicep/json file to the changed files in the module folder structure.
+Assuming there is a changed file in 'Microsoft.Storage\storageAccounts\tableServices\tables'
+the function would return the deploy.bicep file in the same folder.
+
+#>
+function Get-TemplateFileToUpdate {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $ModuleFolderPath
+    )
+
+    $ModifiedFiles = Get-ModifiedFileList -Verbose
+    Write-Verbose "Looking for modified files under: [$ModuleFolderPath]" -Verbose
+    $ModifiedModuleFiles = $ModifiedFiles | Where-Object { $_.FullName -like "*$ModuleFolderPath*" }
+
+    $TemplateFilesToUpdate = $ModifiedModuleFiles | ForEach-Object {
+        Find-TemplateFile -Path $_.FullName -Verbose
+    } | Sort-Object -Property FullName -Unique -Descending
+
+    if ($TemplateFilesToUpdate.Count -eq 0) {
+        Write-Verbose 'No template file found in the modified module.' -Verbose
+    }
+
+    Write-Verbose ('Modified modules found: [{0}]' -f $TemplateFilesToUpdate.count) -Verbose
+    $TemplateFilesToUpdate | ForEach-Object {
+        Write-Verbose " - $($_.FullName)" -Verbose
+    }
+
+    return $TemplateFilesToUpdate
+}
+
+<#
+.SYNOPSIS
+Gets the parent deploy.bicep/json file(s) to the changed files in the module folder structure.
+
+.DESCRIPTION
+Gets the parent deploy.bicep/json file(s) to the changed files in the module folder structure.
+
+.PARAMETER TemplateFilePath
+Mandatory. Path to a deploy.bicep/json file.
+
+.PARAMETER Recurse
+Optional. If true, the function will recurse up the folder structure to find the closest deploy.bicep/json file.
+
+.EXAMPLE
+Get-ParentModuleTemplateFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep' -Recurse
+
+    Directory: C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices
+
+Mode                 LastWriteTime         Length Name
+----                 -------------         ------ ----
+la---          05.12.2021    22:45           1427 deploy.bicep
+
+    Directory: C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts
+
+Mode                 LastWriteTime         Length Name
+----                 -------------         ------ ----
+la---          02.12.2021    13:19          10768 deploy.bicep
+
+Gets the parent deploy.bicep/json file(s) to the changed files in the module folder structure.
+
+#>
+function Get-ParentModuleTemplateFile {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $TemplateFilePath,
+
+        [Parameter(Mandatory = $false)]
+        [switch] $Recurse
+    )
+
+    $ModuleFolderPath = Split-Path $TemplateFilePath -Parent
+    $ParentFolderPath = Split-Path $ModuleFolderPath -Parent
+
+    #Prioritizing the bicep file
+    $ParentTemplateFilePath = Join-Path -Path $ParentFolderPath -ChildPath 'deploy.bicep'
+    if (-not (Test-Path $TemplateFilePath)) {
+        $ParentTemplateFilePath = Join-Path -Path $ParentFolderPath -ChildPath 'deploy.json'
+    }
+
+    if (-not (Test-Path -Path $ParentTemplateFilePath)) {
+        Write-Verbose "No parent template file found at: [$ParentTemplateFilePath]" -Verbose
+        return
+    }
+
+    Write-Verbose "Parent template file found at: [$ParentTemplateFilePath]" -Verbose
+    $ParentTemplateFilesToUpdate = [System.Collections.ArrayList]@()
+    $ParentTemplateFilesToUpdate += $ParentTemplateFilePath | Get-Item
+
+    if ($Recurse) {
+        $ParentTemplateFilesToUpdate += Get-ParentModuleTemplateFile $ParentTemplateFilePath -Recurse
+    }
+
+    return $ParentTemplateFilesToUpdate
+}
+
+<#
+.SYNOPSIS
+Get the number of commits following the specified commit.
+
+.PARAMETER Commit
+Optional. A specified git reference to get commit counts on.
+
+.EXAMPLE
+Get-GitDistance -Commit origin/main.
+
+620
+
+There are currently 620 commits on origin/main. When run as a push on main, this will be the current commit number on the main branch.
+#>
+function Get-GitDistance {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $false)]
+        [string] $Commit = 'HEAD'
+
+    )
+
+    return [int](git rev-list --count $Commit) + 1
+}
+
+<#
+.SYNOPSIS
+Gets the version from the version file from the corresponding deploy.bicep/json file.
+
+.DESCRIPTION
+Gets the version file from the corresponding deploy.bicep/json file.
+The file needs to be in the same folder as the template file itself.
+
+.PARAMETER TemplateFilePath
+Mandatory. Path to a deploy.bicep/json file.
+
+.EXAMPLE
+Get-ModuleVersionFromFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
+
+0.3
+
+Get the version file from the specified deploy.bicep file.
+#>
+function Get-ModuleVersionFromFile {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $TemplateFilePath
+    )
+
+    $ModuleFolder = Split-Path -Path $TemplateFilePath -Parent
+    $VersionFilePath = Join-Path -Path $ModuleFolder -ChildPath 'version.json'
+
+    if (-not (Test-Path -Path $VersionFilePath)) {
+        throw "No version file found at: $VersionFilePath"
+    }
+
+    $VersionFileContent = Get-Content $VersionFilePath | ConvertFrom-Json
+
+    return $VersionFileContent.version
+}
+
+<#
+.SYNOPSIS
+Generates a new version for the specified module.
+
+.DESCRIPTION
+Generates a new version for the specified module, based on version.json file and git commit count.
+Major and minor version numbers are gathered from the version.json file.
+Patch version number is calculated based on the git commit count on the branch.
+
+.PARAMETER TemplateFilePath
+Mandatory. Path to a deploy.bicep/json file.
+
+.EXAMPLE
+Get-NewModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
+
+0.3.630
+
+Generates a new version for the tables module.
+
+#>
+function Get-NewModuleVersion {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $TemplateFilePath
+    )
+
+    $Version = Get-ModuleVersionFromFile -TemplateFilePath $TemplateFilePath
+    $Patch = Get-GitDistance
+    $NewVersion = "$Version.$Patch"
+
+    $BranchName = Get-GitBranchName -Verbose
+
+    Write-Verbose "Current branch: [$BranchName]" -Verbose
+    if (($BranchName -ne 'main') -or ($BranchName -ne 'master') ) {
+        $PreRelease = $BranchName -replace '[^a-zA-Z0-9\.\-_]'
+        Write-Verbose "PreRelease: [$PreRelease]" -Verbose
+        $NewVersion = "$NewVersion-prerelease".ToLower()
+    }
+
+    Write-Verbose "New version: [$NewVersion]" -Verbose
+
+    return $NewVersion
+}
+
+#endregion
+
+<#
+.SYNOPSIS
+Generates a hashtable with template file paths to update with a new version.
+
+.DESCRIPTION
+Generates a hashtable with template file paths to update with a new version.
+
+.PARAMETER TemplateFilePath
+Mandatory. Path to a deploy.bicep/json file.
+
+.EXAMPLE
+Get-ModulesToUpdate -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\deploy.bicep'
+
+
+Name               Value
+----               -----
+TemplateFilePath   C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\fileServices\shares\deploy.bicep
+Version            0.3.848-prerelease
+TemplateFilePath   C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\fileServices\deploy.bicep
+Version            0.3.848-prerelease
+TemplateFilePath   C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\deploy.bicep
+Version            0.3.848-prerelease
+
+Generates a hashtable with template file paths to update and their new versions.
+
+
+#>#
+function Get-ModulesToUpdate {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $TemplateFilePath
+    )
+
+    $ModuleFolderPath = Split-Path $TemplateFilePath -Parent
+    $TemplateFilesToUpdate = Get-TemplateFileToUpdate -ModuleFolderPath $ModuleFolderPath | Sort-Object FullName -Descending
+
+    $ModulesToUpdate = [System.Collections.ArrayList]@()
+    foreach ($TemplateFileToUpdate in $TemplateFilesToUpdate) {
+        $ModuleVersion = Get-NewModuleVersion -TemplateFilePath $TemplateFileToUpdate.FullName -Verbose
+        $ModulesToUpdate += @{
+            Version          = $ModuleVersion
+            TemplateFilePath = $TemplateFileToUpdate.FullName
+        }
+
+        $ParentTemplateFilesToUpdate = Get-ParentModuleTemplateFile -TemplateFilePath $TemplateFileToUpdate.FullName -Recurse
+        Write-Verbose "Found [$($ParentTemplateFilesToUpdate.count)] parent template files to update" -Verbose
+        foreach ($ParentTemplateFileToUpdate in $ParentTemplateFilesToUpdate) {
+            $ParentModuleVersion = Get-NewModuleVersion -TemplateFilePath $ParentTemplateFileToUpdate.FullName
+
+            $ModulesToUpdate += @{
+                Version          = $ParentModuleVersion
+                TemplateFilePath = $ParentTemplateFileToUpdate.FullName
+            }
+        }
+    }
+
+    $ModulesToUpdate = $ModulesToUpdate | Sort-Object TemplateFilePath -Descending -Unique
+
+    Write-Verbose 'Update the following modules:'-Verbose
+    $ModulesToUpdate | ForEach-Object {
+        Write-Verbose (' - [{0}] [{1}] ' -f $_.Version, $_.TemplateFilePath) -Verbose
+    }
+
+    return $ModulesToUpdate
+}
diff --git a/utilities/pipelines/resourcePublish/Initialize-UniversalArtifactPublish.ps1 b/utilities/pipelines/resourcePublish/Initialize-UniversalArtifactPublish.ps1
deleted file mode 100644
index 3975d90a98..0000000000
--- a/utilities/pipelines/resourcePublish/Initialize-UniversalArtifactPublish.ps1
+++ /dev/null
@@ -1,150 +0,0 @@
-<#
-.SYNOPSIS
-Prepare to publish a module as an universal package to a DevOps artifact feed
-
-.DESCRIPTION
-Prepare to publish a module as an universal package to a DevOps artifact feed
-The function will take evaluate which version should be published based on the provided input parameters (CustomVersion, VersioningOption) and the version currently deployed to the feed
-The CustomVersion is considered only if it is higher than the latest version deployed to the artifact feed
-Otherwise, one of the provided version options is chosen and applied with the default being 'patch'
-
-The function returns
-- the name of the artifact to publish
-- the version option to be applied if applicable
-- the version to be applied if applicable
-
-.PARAMETER TemplateFilePath
-Mandatory. Path to the module deployment file from root.
-
-.PARAMETER VstsOrganization
-Mandatory. Name of the organization hosting the artifacts feed.
-
-.PARAMETER VstsProject
-Optional. Name of the project hosting the artifacts feed. May be empty.
-
-.PARAMETER BearerToken
-Optional. The bearer token to use to authenticate the request. If not provided it MUST be existing in your environment as `$env:TOKEN`
-
-.PARAMETER VstsFeedName
-Mandatory. Name to the feed to publish to.
-
-.PARAMETER CustomVersion
-Optional. A custom version the can be provided as a value in the pipeline file.
-
-.PARAMETER VersioningOption
-Optional. A version option that can be specified in the UI. Defaults to 'patch'
-
-.EXAMPLE
-Initialize-UniversalArtifactPublish -TemplateFilePath 'C:/KeyVault/deploy.json' -VstsOrganization 'servicescode' -VstsProject '$(System.TeamProject)' -VstsFeedName 'Modules' -CustomVersion '3.0.0'
-
-Try to publish the key vault module with version 3.0.0 to the module feed 'servicescode/$(System.TeamProject)/Modules' based on a value provided in the UI
-
-.EXAMPLE
-Initialize-UniversalArtifactPublish -TemplateFilePath 'C:/KeyVault/deploy.json' -VstsOrganization 'servicescode' -VstsProject '$(System.TeamProject)' -VstsFeedName 'Modules' -CustomVersion '1.0.0'
-
-Try to publish the key vault module with version 1.0.0 to the module feed 'servicescode/$(System.TeamProject)/Modules' based on a value provided in the pipeline file
-
-.EXAMPLE
-Initialize-UniversalArtifactPublish -TemplateFilePath 'C:/KeyVault/deploy.json' -VstsOrganization 'servicescode' -VstsProject '$(System.TeamProject)' -VstsFeedName 'Modules'
-
-Try to publish the next key vault module version to the module feed 'servicescode/$(System.TeamProject)/Modules' based on the default versioning behavior
-#>
-function Initialize-UniversalArtifactPublish {
-
-    [CmdletBinding()]
-    param (
-        [Parameter(Mandatory)]
-        [string] $TemplateFilePath,
-
-        [Parameter(Mandatory)]
-        [string] $VstsOrganization,
-
-        [Parameter(Mandatory = $false)]
-        [string] $VstsProject = '',
-
-        [Parameter(Mandatory)]
-        [string] $VstsFeedName,
-
-        [Parameter(Mandatory = $false)]
-        [string] $BearerToken = $env:TOKEN,
-
-        [Parameter(Mandatory = $false)]
-        [string] $CustomVersion = '0.0.1',
-
-        [Parameter(Mandatory = $false)]
-        [ValidateSet('Major', 'Minor', 'Patch', 'Custom')]
-        [string] $VersioningOption = 'Patch'
-    )
-
-    begin {
-        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
-    }
-
-    process {
-        # For function output
-        $resultSet = @{}
-
-        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
-        $universalPackageModuleName = $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower()
-        $resultSet['universalPackageModuleName'] = $universalPackageModuleName
-
-        #################################
-        ##    FIND AVAILABLE VERSION   ##
-        #################################
-        try {
-            $head = @{ Authorization = "Bearer $BearerToken" }
-            $url = "https://feeds.dev.azure.com/$VstsOrganization/{0}_apis/packaging/Feeds/$VstsFeedName/packages?packageNameQuery=$universalPackageModuleName&api-version=6.0-preview" -f ([String]::IsNullOrEmpty($VstsProject) ? '/' : "$VstsProject/")
-            $packages = Invoke-RestMethod -Uri $url -Method Get -Headers $head -ContentType application/json
-            if ($packages) {
-                if ($packages.value.ID.count -gt 1) {
-                    # Handle the case where multiple modules in the feed start with with the same packageName. In this case we have to filter the result of the REST query even further.
-                    $packages.value = $packages.value | Where-Object { $_.Name -eq $universalPackageModuleName }
-                }
-
-                $latestFeedVersion = ($packages.value.versions.Where( { $_.isLatest -eq $True })).version
-                Write-Verbose ('Package ID of [{0}] is [{1}]' -f $universalPackageModuleName, $packages.value.ID) -Verbose
-                Write-Verbose "The latest version is [$latestFeedVersion]" -Verbose
-            } else {
-                Write-Verbose "No packages via url [$url] found" -Verbose
-            }
-        } catch {
-            $_
-        }
-
-        ############################
-        ##    EVALUATE VERSION    ##
-        ############################
-
-        if ([String]::IsNullOrEmpty($latestFeedVersion)) {
-            Write-Verbose ('No version for module [{0}] found in feed [{1}]. Assuming intial publish' -f $universalPackageModuleName, $VstsFeedName) -Verbose
-            $latestFeedVersion = New-Object System.Version('0.0.1')
-        } elseif (-not (([String]::IsNullOrEmpty($CustomVersion)) -or ([String]::IsNullOrEmpty($latestFeedVersion))) -and ((New-Object System.Version($CustomVersion)) -gt (New-Object System.Version($latestFeedVersion))) ) {
-            Write-Verbose "A custom version [$CustomVersion] was specified in the pipeline script and is higher than the current latest. Using it." -Verbose
-            $VersioningOption = 'custom'
-            $newVersion = $CustomVersion
-        } else {
-            Write-Verbose 'No custom version set. Using default versioning.'
-        }
-
-        # Test if mode custom
-        # -------------------
-        if ($VersioningOption -eq 'custom') {
-            $newVersionObject = New-Object System.Version($newVersion)
-            $latestFeedVersionObject = New-Object System.Version($latestFeedVersion)
-            if ($newVersionObject -lt $latestFeedVersionObject -or $newVersionObject -eq $latestFeedVersionObject) {
-                throw ('The provided custom version [{0}] must be higher than the current latest version [{1}] published in the artifacts feed [{2}]' -f $newVersionObject.ToString(), $latestFeedVersionObject.ToString(), $VstsFeedName)
-            }
-            Write-Verbose "Using publish version [$newVersionObject]" -Verbose
-            $resultSet['newVersionObject'] = $newVersionObject
-        }
-        Write-Verbose "Using publish mode [$VersioningOption]" -Verbose
-        $resultSet['publishingMode'] = $VersioningOption
-
-        return $resultSet
-    }
-
-    end {
-        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
-
-    }
-}
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
index 0165dd26a5..584582b4e1 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
@@ -4,55 +4,50 @@ Publish a new version of a given module to a private bicep registry
 
 .DESCRIPTION
 Publish a new version of a given module to a private bicep registry
-The function will take evaluate which version should be published based on the provided input parameters (customVersion, versioningOption) and the version currently deployed to the private bicep registry
-If the customVersion is higher than the current latest, it has the highest priority over the other options
-Otherwise, one of the provided version options is chosen and applied with the default being 'patch'
 
-.PARAMETER templateFilePath
+.PARAMETER TemplateFilePath
 Mandatory. Path to the module deployment file from root.
+Example: 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
 
-.PARAMETER bicepRegistryName
+.PARAMETER ModuleVersion
+Mandatory. Version of the module to publish, following SemVer convention.
+Example: '1.0.0', '2.1.5-alpha.1', '0.0.5-beta.1'
+
+.PARAMETER BicepRegistryName
 Mandatory. Name of the private bicep registry to publish to.
+Example: 'adpsxxazacrx001'
 
-.PARAMETER bicepRegistryRgName
+.PARAMETER BicepRegistryRgName
 Mandatory. ResourceGroup of the private bicep registry to publish to.
+Example: 'artifacts-rg'
 
-.PARAMETER bicepRegistryRgLocation
+.PARAMETER BicepRegistryRgLocation
 Optional. The location of the resourceGroup the private bicep registry is deployed to. Required if the resource group is not yet existing.
-
-.PARAMETER customVersion
-Optional. A custom version that can be provided by the UI. '-' represents an empty value.
-
-.PARAMETER versioningOption
-Optional. A version option that can be specified in the UI. Defaults to 'patch'
+Example: 'West Europe'
 
 .EXAMPLE
-Publish-ModuleToPrivateBicepRegistry -templateFilePath 'C:/KeyVault/deploy.json' -bicepRegistryRgName 'artifacts-rg' -customVersion '3.0.0'
+Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg'
 
-Try to publish the KeyVault module with version 3.0.0 to a private bicep registry called KeyVault based on a value provided in the UI
+Try to publish the KeyVault module with version 3.0.0-alpha to a private bicep registry called 'adpsxxazacrx001' in resource group 'artifacts-rg'.
 #>
 function Publish-ModuleToPrivateBicepRegistry {
 
     [CmdletBinding(SupportsShouldProcess)]
     param (
         [Parameter(Mandatory)]
-        [string] $templateFilePath,
+        [string] $TemplateFilePath,
 
         [Parameter(Mandatory)]
-        [string] $bicepRegistryRgName,
-
-        [Parameter(Mandatory = $false)]
-        [string] $bicepRegistryRgLocation,
+        [string] $ModuleVersion,
 
         [Parameter(Mandatory)]
-        [string] $bicepRegistryName,
+        [string] $BicepRegistryName,
 
-        [Parameter(Mandatory = $false)]
-        [string] $customVersion = '0.0.1',
+        [Parameter(Mandatory)]
+        [string] $BicepRegistryRgName,
 
         [Parameter(Mandatory = $false)]
-        [ValidateSet('Major', 'Minor', 'Patch')]
-        [string] $versioningOption = 'Patch'
+        [string] $BicepRegistryRgLocation
     )
 
     begin {
@@ -63,88 +58,34 @@ function Publish-ModuleToPrivateBicepRegistry {
         #############################
         ##    EVALUATE RESOURCES   ##
         #############################
-        if ((Split-Path $templateFilePath -Extension) -ne '.bicep') {
-            throw "The template in path [$templateFilePath] is no bicep template."
+        if ((Split-Path $TemplateFilePath -Extension) -ne '.bicep') {
+            throw "The template in path [$TemplateFilePath] is no bicep template."
         }
 
         # Resource Group
-        if (-not (Get-AzResourceGroup -Name $bicepRegistryRgName -ErrorAction 'SilentlyContinue')) {
-            if ($PSCmdlet.ShouldProcess("Resource group [$bicepRegistryRgName] to location [$bicepRegistryRgLocation]", 'Deploy')) {
-                New-AzResourceGroup -Name $bicepRegistryRgName -Location $bicepRegistryRgLocation
+        if (-not (Get-AzResourceGroup -Name $BicepRegistryRgName -ErrorAction 'SilentlyContinue')) {
+            if ($PSCmdlet.ShouldProcess("Resource group [$BicepRegistryRgName] to location [$BicepRegistryRgLocation]", 'Deploy')) {
+                New-AzResourceGroup -Name $BicepRegistryRgName -Location $BicepRegistryRgLocation
             }
         }
 
         # Registry
-        if (-not (Get-AzContainerRegistry -ResourceGroupName $bicepRegistryRgName -Name $bicepRegistryName -ErrorAction 'SilentlyContinue')) {
-            if ($PSCmdlet.ShouldProcess("Container Registry [$bicepRegistryName] to resource group [$bicepRegistryRgName]", 'Deploy')) {
-                New-AzContainerRegistry -ResourceGroupName $bicepRegistryRgName -Name $bicepRegistryName -Sku 'Basic'
+        if (-not (Get-AzContainerRegistry -ResourceGroupName $BicepRegistryRgName -Name $BicepRegistryName -ErrorAction 'SilentlyContinue')) {
+            if ($PSCmdlet.ShouldProcess("Container Registry [$BicepRegistryName] to resource group [$BicepRegistryRgName]", 'Deploy')) {
+                New-AzContainerRegistry -ResourceGroupName $BicepRegistryRgName -Name $BicepRegistryName -Sku 'Basic'
             }
         }
 
-        #################################
-        ##    FIND AVAILABLE VERSION   ##
-        #################################
         # Extracts Microsoft.KeyVault/vaults from e.g. C:\arm\Microsoft.KeyVault\vaults\deploy.bicep
-        $moduleIdentifier = (Split-Path $templateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
+        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
         $moduleRegistryIdentifier = 'bicep/modules/{0}' -f $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower()
 
-        if (-not ($repositories = Get-AzContainerRegistryRepository -RegistryName $bicepRegistryName -ErrorAction 'SilentlyContinue')) {
-            # No repositories yet
-            $repositories = @()
-        }
-
-        if ($repositories.Contains($moduleRegistryIdentifier)) {
-            $versions = (Get-AzContainerRegistryTag -RegistryName $bicepRegistryName -RepositoryName $moduleRegistryIdentifier).Tags.Name
-            $latestVersion = (($versions -as [Version[]]) | Measure-Object -Maximum).Maximum
-            Write-Verbose "Published versions detected in private bicep registry [$moduleIdentifier]. Fetched latest [$latestVersion]."
-        } else {
-            Write-Verbose "No version for module reference [$moduleRegistryIdentifier] detected in private bicep registry [$bicepRegistryName]. Creating new."
-            $latestVersion = New-Object System.Version('0.0.0')
-        }
-
-        ############################
-        ##    EVALUATE VERSION    ##
-        ############################
-
-        if (-not ([String]::IsNullOrEmpty($customVersion)) -and ((New-Object System.Version($customVersion)) -gt (New-Object System.Version($latestVersion)))) {
-            Write-Verbose "A custom version [$customVersion] was specified in the pipeline script and is higher than the current latest. Using it."
-            $newVersion = $customVersion
-        } else {
-            Write-Verbose 'No custom version set. Using default versioning.'
-
-            switch ($versioningOption) {
-                'major' {
-                    Write-Verbose 'Apply version update on "major" level'
-                    $newVersion = (New-Object -TypeName System.Version -ArgumentList ($latestVersion.Major + 1), 0, 0).ToString()
-                    break
-                }
-                'minor' {
-                    Write-Verbose 'Apply version update on "minor" level'
-                    $newVersion = (New-Object -TypeName System.Version -ArgumentList $latestVersion.Major, ($latestVersion.Minor + 1), 0).ToString()
-                    break
-                }
-                'patch' {
-                    Write-Verbose 'Apply version update on "patch" level'
-                    $newVersion = (New-Object -TypeName System.Version -ArgumentList $latestVersion.Major, $latestVersion.Minor, ($latestVersion.Build + 1)).ToString()
-                    break
-                }
-                default {
-                    throw "Unsupported version option: $versioningOption."
-                }
-            }
-        }
-
-        $newVersionObject = New-Object System.Version($newVersion)
-        if ($newVersionObject -lt $latestVersion -or $newVersionObject -eq $latestVersion) {
-            throw ('The provided custom version [{0}] must be higher than the current latest version [{1}] published in the private bicep registry [{2}]' -f $newVersionObject.ToString(), $latestVersion.ToString(), $bicepRegistryName)
-        }
-
         #############################################
         ##    Publish to private bicep registry    ##
         #############################################
-        $publishingTarget = 'br:{0}.azurecr.io/{1}:{2}' -f $bicepRegistryName, $moduleRegistryIdentifier, $newVersion
-        if ($PSCmdlet.ShouldProcess("Private bicep registry entry [$moduleRegistryIdentifier] version [$newVersion] to registry [$bicepRegistryName]", 'Publish')) {
-            bicep publish $templateFilePath --target $publishingTarget
+        $publishingTarget = 'br:{0}.azurecr.io/{1}:{2}' -f $BicepRegistryName, $moduleRegistryIdentifier, $ModuleVersion
+        if ($PSCmdlet.ShouldProcess("Private bicep registry entry [$moduleRegistryIdentifier] version [$ModuleVersion] to registry [$BicepRegistryName]", 'Publish')) {
+            bicep publish $TemplateFilePath --target $publishingTarget
         }
         Write-Verbose 'Publish complete'
     }
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
index 19cfa37b7d..1a0a883a5f 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
@@ -4,57 +4,51 @@ Publish a new version of a given module to a template spec
 
 .DESCRIPTION
 Publish a new version of a given module to a template spec
-The function will take evaluate which version should be published based on the provided input parameters (customVersion, versioningOption) and the version currently deployed to the template spec
-If the customVersion is higher than the current latest, it has the highest priority over the other options
-Otherwise, one of the provided version options is chosen and applied with the default being 'patch'
-
 The template spec is set up if not already existing.
 
-.PARAMETER templateFilePath
+.PARAMETER TemplateFilePath
 Mandatory. Path to the module deployment file from root.
+Example: 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
+
+.PARAMETER ModuleVersion
+Mandatory. Version of the module to publish, following SemVer convention.
+Example: '1.0.0', '2.1.5-alpha.1', '0.0.5-beta.1'
 
-.PARAMETER templateSpecsRgName
+.PARAMETER TemplateSpecsRgName
 Mandatory. ResourceGroup of the template spec to publish to.
+Example: 'artifacts-rg'
 
-.PARAMETER templateSpecsRgLocation
+.PARAMETER TemplateSpecsRgLocation
 Mandatory. Location of the template spec resource group.
+Example: 'West Europe'
 
-.PARAMETER templateSpecsDescription
+.PARAMETER TemplateSpecsDescription
 Mandatory. The description of the parent template spec.
-
-.PARAMETER customVersion
-Optional. A custom version that can be provided by the UI. '-' represents an empty value.
-
-.PARAMETER versioningOption
-Optional. A version option that can be specified in the UI. Defaults to 'patch'
+Example: 'iacs key vault'
 
 .EXAMPLE
-Publish-ModuleToTemplateSpec -templateFilePath 'C:/KeyVault/deploy.json' -templateSpecsRgName 'artifacts-rg' -templateSpecsRgLocation 'West Europe' -templateSpecsDescription 'iacs key vault' -customVersion '3.0.0'
+Publish-ModuleToTemplateSpec -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -TemplateSpecsRgName 'artifacts-rg' -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'iacs key vault'
 
-Try to publish the KeyVault module with version 3.0.0 to a template spec called KeyVault based on a value provided in the UI
+Try to publish the KeyVault module with version 3.0.0-alpha to a template spec in resource group 'artifacts-rg'.
 #>
 function Publish-ModuleToTemplateSpec {
 
     [CmdletBinding(SupportsShouldProcess)]
     param (
         [Parameter(Mandatory)]
-        [string] $templateFilePath,
+        [string] $TemplateFilePath,
 
         [Parameter(Mandatory)]
-        [string] $templateSpecsRgName,
+        [string] $ModuleVersion,
 
         [Parameter(Mandatory)]
-        [string] $templateSpecsRgLocation,
+        [string] $TemplateSpecsRgName,
 
         [Parameter(Mandatory)]
-        [string] $templateSpecsDescription,
+        [string] $TemplateSpecsRgLocation,
 
-        [Parameter(Mandatory = $false)]
-        [string] $customVersion = '0.0.1',
-
-        [Parameter(Mandatory = $false)]
-        [ValidateSet('Major', 'Minor', 'Patch')]
-        [string] $versioningOption = 'Patch'
+        [Parameter(Mandatory)]
+        [string] $TemplateSpecsDescription
     )
 
     begin {
@@ -62,78 +56,29 @@ function Publish-ModuleToTemplateSpec {
     }
 
     process {
-        $moduleIdentifier = (Split-Path $templateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
+        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
         $templateSpecIdentifier = $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower()
 
         #############################
         ##    EVALUATE RESOURCES   ##
         #############################
-        if (-not (Get-AzResourceGroup -Name $templateSpecsRgName -ErrorAction 'SilentlyContinue')) {
-            if ($PSCmdlet.ShouldProcess("Resource group [$templateSpecsRgName] to location [$templateSpecsRgLocation]", 'Deploy')) {
-                New-AzResourceGroup -Name $templateSpecsRgName -Location $templateSpecsRgLocation
+        if (-not (Get-AzResourceGroup -Name $TemplateSpecsRgName -ErrorAction 'SilentlyContinue')) {
+            if ($PSCmdlet.ShouldProcess("Resource group [$TemplateSpecsRgName] to location [$TemplateSpecsRgLocation]", 'Deploy')) {
+                New-AzResourceGroup -Name $TemplateSpecsRgName -Location $TemplateSpecsRgLocation
             }
         }
 
-        #################################
-        ##    FIND AVAILABLE VERSION   ##
-        #################################
-        if ($templateSpec = Get-AzTemplateSpec -ResourceGroupName $templateSpecsRgName -Name $templateSpecIdentifier -ErrorAction 'SilentlyContinue') {
-            $uniqueVersions = $templateSpec.Versions.Name | Get-Unique | Where-Object { $_ -like '*.*.*' } # remove Where-object for working example
-            $latestVersion = (($uniqueVersions -as [Version[]]) | Measure-Object -Maximum).Maximum
-            Write-Verbose "Published versions detected in template spec [$templateSpecIdentifier]. Fetched latest [$latestVersion]."
-        } else {
-            Write-Verbose "No version detected in template spec [$templateSpecIdentifier]. Creating new."
-            $latestVersion = New-Object System.Version('0.0.0')
-        }
-
-        ############################
-        ##    EVALUATE VERSION    ##
-        ############################
-
-        if (-not ([String]::IsNullOrEmpty($customVersion)) -and ((New-Object System.Version($customVersion)) -gt (New-Object System.Version($latestVersion)))) {
-            Write-Verbose "A custom version [$customVersion] was specified in the pipeline script and is higher than the current latest. Using it."
-            $newVersion = $customVersion
-        } else {
-            Write-Verbose 'No custom version set. Using default versioning.'
-
-            switch ($versioningOption) {
-                'major' {
-                    Write-Verbose 'Apply version update on "major" level'
-                    $newVersion = (New-Object -TypeName System.Version -ArgumentList ($latestVersion.Major + 1), 0, 0).ToString()
-                    break
-                }
-                'minor' {
-                    Write-Verbose 'Apply version update on "minor" level'
-                    $newVersion = (New-Object -TypeName System.Version -ArgumentList $latestVersion.Major, ($latestVersion.Minor + 1), 0).ToString()
-                    break
-                }
-                'patch' {
-                    Write-Verbose 'Apply version update on "patch" level'
-                    $newVersion = (New-Object -TypeName System.Version -ArgumentList $latestVersion.Major, $latestVersion.Minor, ($latestVersion.Build + 1)).ToString()
-                    break
-                }
-                default {
-                    throw "Unsupported version option: $versioningOption."
-                }
-            }
-        }
-
-        $newVersionObject = New-Object System.Version($newVersion)
-        if ($newVersionObject -lt $latestVersion -or $newVersionObject -eq $latestVersion) {
-            throw ('The provided custom version [{0}] must be higher than the current latest version [{1}] published in the template spec [{2}]' -f $newVersionObject.ToString(), $latestVersion.ToString(), $templateSpecIdentifier)
-        }
-
         ################################
         ##    Create template spec    ##
         ################################
-        if ($PSCmdlet.ShouldProcess("Template spec [$templateSpecIdentifier] version [$newVersion]", 'Publish')) {
+        if ($PSCmdlet.ShouldProcess("Template spec [$templateSpecIdentifier] version [$ModuleVersion]", 'Publish')) {
             $templateSpecInputObject = @{
-                ResourceGroupName = $templateSpecsRgName
+                ResourceGroupName = $TemplateSpecsRgName
                 Name              = $templateSpecIdentifier
-                Version           = $newVersion
-                Description       = $templateSpecsDescription
-                Location          = $templateSpecsRgLocation
-                TemplateFile      = $templateFilePath
+                Version           = $ModuleVersion
+                Description       = $TemplateSpecsDescription
+                Location          = $TemplateSpecsRgLocation
+                TemplateFile      = $TemplateFilePath
             }
             New-AzTemplateSpec @templateSpecInputObject -Force
         }
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
new file mode 100644
index 0000000000..21d792f3c4
--- /dev/null
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
@@ -0,0 +1,115 @@
+<#
+.SYNOPSIS
+Publish a new version of a given module to an Azure DevOps artifact feed as a universal package.
+
+.DESCRIPTION
+Publish a new version of a given module to an Azure DevOps artifact feed as a universal package.
+
+.PARAMETER TemplateFilePath
+Mandatory. Path to the module deployment file from root.
+Example: 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
+
+.PARAMETER ModuleVersion
+Mandatory. Version of the module to publish, following SemVer convention.
+Example: '1.0.0', '2.1.5-alpha.1', '0.0.5-beta.1'
+
+.PARAMETER VstsOrganizationUri
+Mandatory. Azure DevOps organization URL hosting the artifacts feed.
+Example: 'https://dev.azure.com/fabrikam/'.
+
+.PARAMETER VstsFeedProject
+Optional. Name of the project hosting the artifacts feed. May be empty.
+Example: 'IaC'.
+
+.PARAMETER VstsFeedName
+Mandatory. Name to the feed to publish to.
+Example: 'Artifacts'.
+
+.PARAMETER BearerToken
+Optional. The bearer token to use to authenticate the request. If not provided it MUST be existing in your environment as `$env:TOKEN`
+
+.EXAMPLE
+Publish-ModuleToUniversalArtifactFeed -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -vstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts'
+
+Try to publish the KeyVault module with version 3.0.0-alpha to a Universal Package Feed called 'Artifacts' under the project 'IaC'.
+#>
+function Publish-ModuleToUniversalArtifactFeed {
+
+    [CmdletBinding(SupportsShouldProcess)]
+    param (
+        [Parameter(Mandatory)]
+        [string] $TemplateFilePath,
+
+        [Parameter(Mandatory)]
+        [string] $VstsOrganizationUri,
+
+        [Parameter(Mandatory = $false)]
+        [string] $VstsFeedProject = '',
+
+        [Parameter(Mandatory)]
+        [string] $VstsFeedName,
+
+        [Parameter(Mandatory = $false)]
+        [string] $BearerToken = $env:TOKEN,
+
+        [Parameter(Mandatory)]
+        [string] $ModuleVersion
+    )
+
+    begin {
+        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
+    }
+
+    process {
+
+        #################################
+        ##    Generate package name    ##
+        #################################
+
+        # Universal package names => lowercase alphanumerics, dashes, dots or underscores, under 256 characters.
+        # 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' => 'microsoft.keyvault.vaults'
+        $ModuleFolderPath = Split-Path $TemplateFilePath -Parent
+        $universalPackageModuleName = $ModuleFolderPath.Replace('\', '/').Split('/arm/')[1]
+        $universalPackageModuleName = ($universalPackageModuleName.Replace('\', '.').Replace('/', '.').toLower() -Replace '[^a-z0-9\.\-_]')[0..255] -join ''
+        Write-Verbose "The universal package name is [$universalPackageModuleName]" -Verbose
+
+        ###########################
+        ##    Find feed scope    ##
+        ###########################
+        $feedScope = 'organization'
+
+        if (-not [string]::IsNullOrEmpty($VstsFeedProject)) {
+            $feedScope = 'project'
+        }
+        Write-Verbose "The package feed scope is [$feedScope]" -Verbose
+
+        #############################################
+        ##    Publish to Universal Package Feed    ##
+        #############################################
+        if ($PSCmdlet.ShouldProcess("Universal Package Feed entry [$universalPackageModuleName] version [$ModuleVersion] to feed [$VstsOrganizationUri/$VstsFeedProject/$VstsFeedName]", 'Publish')) {
+            $env:AZURE_DEVOPS_EXT_PAT = $BearerToken
+            $inputObject = @(
+                '--organization', "$VstsOrganizationUri",
+                '--feed', "$VstsFeedName",
+                '--scope', "$feedScope",
+                '--name', "$universalPackageModuleName",
+                '--version', "$ModuleVersion",
+                '--path', "$ModuleFolderPath",
+                '--description', "$universalPackageModuleName Module",
+                '--verbose'
+            )
+
+            if (-not [string]::IsNullOrEmpty($VstsFeedProject)) {
+                $inputObject += @('--project', "$VstsFeedProject")
+            }
+
+            az artifacts universal publish @inputObject
+
+        }
+        Write-Verbose 'Publish complete'
+    }
+
+    end {
+        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
+    }
+}