diff --git a/.ado/workflows/dataProductDeployment.yml b/.ado/workflows/dataProductDeployment.yml
index 187d489..01c55cc 100644
--- a/.ado/workflows/dataProductDeployment.yml
+++ b/.ado/workflows/dataProductDeployment.yml
@@ -74,9 +74,10 @@ stages:
               resourceGroupName: ${{ variables.AZURE_RESOURCE_GROUP_NAME }}
               location: ${{ variables.AZURE_LOCATION }}
               templateLocation: "Linked artifact"
-              csmFile: "$(System.DefaultWorkingDirectory)/infra/main.json"
+              csmFile: "$(System.DefaultWorkingDirectory)/infra/main.bicep"
               csmParametersFile: "$(System.DefaultWorkingDirectory)/infra/params.dev.json"
               deploymentMode: "Validation"
+              deploymentName: "DataProduct-$(Build.SourceVersion)"
               overrideParameters: >
                 -administratorPassword "$(password)"
 
@@ -97,8 +98,9 @@ stages:
                 az deployment group what-if `
                   --resource-group ${{ variables.AZURE_RESOURCE_GROUP_NAME }} `
                   --exclude-change-types Ignore NoChange Unsupported `
+                  --name "DataProduct-$(Build.SourceVersion)" `
                   --mode "Incremental" `
-                  --template-file "$(System.DefaultWorkingDirectory)/infra/main.json" `
+                  --template-file "$(System.DefaultWorkingDirectory)/infra/main.bicep" `
                   --parameters "$(System.DefaultWorkingDirectory)/infra/params.dev.json" administratorPassword="$(password)" `
                   --result-format "FullResourcePayloads"
                 
@@ -159,8 +161,9 @@ stages:
               resourceGroupName: ${{ variables.AZURE_RESOURCE_GROUP_NAME }}
               location: ${{ variables.AZURE_LOCATION }}
               templateLocation: "Linked artifact"
-              csmFile: "$(System.DefaultWorkingDirectory)/infra/main.json"
+              csmFile: "$(System.DefaultWorkingDirectory)/infra/main.bicep"
               csmParametersFile: "$(System.DefaultWorkingDirectory)/infra/params.dev.json"
               deploymentMode: "Incremental"
+              deploymentName: "DataProduct-$(Build.SourceVersion)"
               overrideParameters: >
                 -administratorPassword "$(password)"
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
index 4f16ed4..65774cd 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -58,7 +58,7 @@ body:
       label: Code of Conduct
       description: The Code of Conduct helps create a safe space for everyone. We require that everyone must abide by it.
       options:
-        - label: I agree to follow this project's [Code of Conduct](/CODE_OF_CONDUCT.md)
+        - label: I agree to follow this project's [Code of Conduct](https://github.com/Azure/data-product-streaming/blob/main/CODE_OF_CONDUCT.md)
           required: true
 
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/DOCUMENTATION_ISSUE.yml b/.github/ISSUE_TEMPLATE/DOCUMENTATION_ISSUE.yml
index 7727d6d..e43d166 100644
--- a/.github/ISSUE_TEMPLATE/DOCUMENTATION_ISSUE.yml
+++ b/.github/ISSUE_TEMPLATE/DOCUMENTATION_ISSUE.yml
@@ -25,7 +25,7 @@ body:
       label: Code of Conduct
       description: The Code of Conduct helps create a safe space for everyone. We require that everyone must abide by it.
       options:
-        - label: I agree to follow this project's [Code of Conduct](/CODE_OF_CONDUCT.md)
+        - label: I agree to follow this project's [Code of Conduct](https://github.com/Azure/data-product-streaming/blob/main/CODE_OF_CONDUCT.md)
           required: true
 
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
index 38ea507..b0b2ef8 100644
--- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
@@ -34,7 +34,7 @@ body:
       label: Code of Conduct
       description: The Code of Conduct helps create a safe space for everyone. We require that everyone must abide by it.
       options:
-        - label: I agree to follow this project's [Code of Conduct](/CODE_OF_CONDUCT.md)
+        - label: I agree to follow this project's [Code of Conduct](https://github.com/Azure/data-product-streaming/blob/main/CODE_OF_CONDUCT.md)
           required: true
 
   - type: markdown
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 28fbb9e..322f940 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,7 +7,7 @@
 <!-- Please review the items on the PR checklist before submitting-->
 ## PR Checklist
 * [ ] Closes Issue #xxx
-* [ ] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA
+* [ ] CLA signed. If not, go over [here](https://github.com/Azure/data-product-streaming/blob/main/CODE_OF_CONDUCT.md) and sign the CLA
 
 <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
 ## Validation Steps Performed
diff --git a/.github/workflows/dataProductDeployment.yml b/.github/workflows/dataProductDeployment.yml
index bc94710..fb6b163 100644
--- a/.github/workflows/dataProductDeployment.yml
+++ b/.github/workflows/dataProductDeployment.yml
@@ -2,13 +2,13 @@ name: Data Product Deployment
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
     paths:
       - "code/**"
       - "infra/**"
       - ".github/workflows/dataProductDeployment.yml"
   pull_request:
-    branches: [ main ]
+    branches: [main]
     paths:
       - "code/**"
       - "infra/**"
@@ -54,28 +54,27 @@ jobs:
           subscriptionId: ${{ env.AZURE_SUBSCRIPTION_ID }}
           resourceGroupName: ${{ env.AZURE_RESOURCE_GROUP_NAME }}
           region: ${{ env.AZURE_LOCATION }}
-          template: ${{ github.workspace }}/infra/main.json
+          template: ${{ github.workspace }}/infra/main.bicep
           parameters: ${{ github.workspace }}/infra/params.dev.json administratorPassword="${{ steps.generate_password_001.outputs.password }}"
           deploymentMode: Validate
+          deploymentName: "DataProduct-${{ github.sha }}"
           failOnStdErr: false
 
       # Deploy Data Product - what-if
       - name: Deploy Data Product - what-if
         id: data_product_whatif
-        uses: azure/cli@v1
+        uses: azure/arm-deploy@v1
         with:
-          azcliversion: "agentazcliversion"
-          inlineScript: |
-            az account set \
-              --subscription ${{ env.AZURE_SUBSCRIPTION_ID }}
-            
-            az deployment group what-if \
-              --resource-group ${{ env.AZURE_RESOURCE_GROUP_NAME }} \
-              --exclude-change-types Ignore NoChange Unsupported \
-              --mode "Incremental" \
-              --template-file "${GITHUB_WORKSPACE}/infra/main.json" \
-              --parameters "${GITHUB_WORKSPACE}/infra/params.dev.json" administratorPassword="${{ steps.generate_password_001.outputs.password }}" \
-              --result-format "FullResourcePayloads"
+          scope: resourcegroup
+          subscriptionId: ${{ env.AZURE_SUBSCRIPTION_ID }}
+          resourceGroupName: ${{ env.AZURE_RESOURCE_GROUP_NAME }}
+          region: ${{ env.AZURE_LOCATION }}
+          template: ${{ github.workspace }}/infra/main.bicep
+          parameters: ${{ github.workspace }}/infra/params.dev.json administratorPassword="${{ steps.generate_password_001.outputs.password }}"
+          deploymentMode: Incremental
+          deploymentName: "DataProduct-${{ github.sha }}"
+          failOnStdErr: false
+          additionalArguments: "--what-if --what-if-exclude-change-types Ignore NoChange Unsupported --what-if-result-format FullResourcePayloads"
 
       # Log out from Azure
       - name: Log out from Azure
@@ -122,9 +121,10 @@ jobs:
           subscriptionId: ${{ env.AZURE_SUBSCRIPTION_ID }}
           resourceGroupName: ${{ env.AZURE_RESOURCE_GROUP_NAME }}
           region: ${{ env.AZURE_LOCATION }}
-          template: ${{ github.workspace }}/infra/main.json
+          template: ${{ github.workspace }}/infra/main.bicep
           parameters: ${{ github.workspace }}/infra/params.dev.json administratorPassword="${{ steps.generate_password_001.outputs.password }}"
           deploymentMode: Incremental
+          deploymentName: "DataProduct-${{ github.sha }}"
           failOnStdErr: false
 
       # Log out from Azure