diff --git a/.ci/scripts/set_secret.py b/.ci/scripts/set_secret.py
index 057e83f..721ffd4 100644
--- a/.ci/scripts/set_secret.py
+++ b/.ci/scripts/set_secret.py
@@ -1,5 +1,4 @@
 #!/usr/bin/python3
-
 import argparse
 from azure.keyvault import KeyVaultClient
 from azure.common.client_factory import get_client_from_cli_profile
@@ -8,20 +7,14 @@
 def set_secret(kv_endpoint, secret_name, secret_value):
     client = get_client_from_cli_profile(KeyVaultClient)
 
-    try:
-        client.set_secret(kv_endpoint, secret_name, secret_value)
-        return "Successfully created secret: {secret_name} in keyvault: {kv_endpoint}".format(
-            secret_name=secret_name, kv_endpoint=kv_endpoint)
-    except Exception as ex:
-        return "Failed to create secret: {secret_name} in keyvault: {kv_endpoint}".format(
-            secret_name=secret_name, kv_endpoint=kv_endpoint)
+    client.set_secret(kv_endpoint, secret_name, secret_value)
+    return "Successfully created secret: {secret_name} in keyvault: {kv_endpoint}".format(secret_name=secret_name, kv_endpoint=kv_endpoint)
 
 
 def parse_args():
     parser = argparse.ArgumentParser()
 
-    parser.add_argument('-n', '--secretName', required=True,
-                        help="The name of the secret")
+    parser.add_argument('-n', '--secretName', required=True, help="The name of the secret")
 
     return parser.parse_args()
 
diff --git a/.ci/steps/createResourceGroupTemplate.yml b/.ci/steps/createResourceGroupTemplate.yml
index 65988db..4f26fa1 100644
--- a/.ci/steps/createResourceGroupTemplate.yml
+++ b/.ci/steps/createResourceGroupTemplate.yml
@@ -5,6 +5,8 @@ parameters:
   alias : $(Build.RequestedForId)
   project : "e2etestharness"
   expires : "2019-08-01"
+  deploymentguidtag: "ABC123"
+
 
 steps:
 - task: AzureCLI@1
@@ -14,4 +16,4 @@ steps:
     scriptLocation: inlineScript
     inlineScript: |
       echo Execute Resource Group Delete
-      az group create -l ${{parameters.location}} -n ${{parameters.azureresourcegroup}} --tags alias='${{parameters.alias}}' project='${{parameters.project}}' expires='${{parameters.expires}}'
+      az group create -l ${{parameters.location}} -n ${{parameters.azureresourcegroup}} --tags deployment-id='${{parameters.deploymentguidtag}}' alias='${{parameters.alias}}' project='${{parameters.project}}' expires='${{parameters.expires}}'
diff --git a/.ci/steps/deploy_steps.yml b/.ci/steps/deploy_steps.yml
index a5af773..fe08970 100644
--- a/.ci/steps/deploy_steps.yml
+++ b/.ci/steps/deploy_steps.yml
@@ -32,6 +32,7 @@ steps:
     alias : ${{parameters.alias}}
     project : ${{parameters.project}}
     expires : ${{parameters.expires}}
+    deploymentguidtag: ${{parameters.deploymentguidtag}}
 
 - template: ${{parameters.template}}
   parameters:
@@ -53,7 +54,7 @@ steps:
     inlineScript: |
       source activate ${{parameters.conda}}
       pip install azure azure-cli
-      python .ci/scripts/set_secret.py -n "${{parameters.ENVIRONMENT_PREFIX}}-key"
+      python AIArchitecturesAndPractices/.ci/scripts/set_secret.py -n "${{parameters.ENVIRONMENT_PREFIX}}-key"
 
 
 - task: AzurePowerShell@4