diff --git a/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml b/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml
index 1e9909ee8..4f73d7c71 100644
--- a/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml
+++ b/.pipelines/pipeline.user.linux.official.all_tag.all_phase.all_config.ci_prod.yml
@@ -42,4 +42,7 @@ package:
       repository_name: 'cdpxlinux'                        # only supported ones are cdpx acr repos
       tag: 'ciprod'                                       # OPTIONAL: Defaults to latest. The tag for the built image. Final tag will be 1.0.0alpha, 1.0.0-timestamp-commitID.
       latest: false                                       # OPTIONAL: Defaults to false. If tag is not set to latest and this flag is set, then tag as latest as well and push latest as well.
+      publish_unique_tag: true                            # If set, the image in the registry is tagged with the unique tag generated by CDPx 
+      metadata_file:
+        artifact_path: 'linux-image-meta.json'            # If defined, the drop outputs relative path to the file into which JSON metadata about the created image is emitted.
       export_to_artifact_path: 'agentimage.tar.gz'   # path for exported image and use this instead of fixed tag
diff --git a/.pipelines/pipeline.user.windows.official.all_tag.all_phase.all_config.ci_prod.yml b/.pipelines/pipeline.user.windows.official.all_tag.all_phase.all_config.ci_prod.yml
index 0dc0a47c5..1caf60b7b 100644
--- a/.pipelines/pipeline.user.windows.official.all_tag.all_phase.all_config.ci_prod.yml
+++ b/.pipelines/pipeline.user.windows.official.all_tag.all_phase.all_config.ci_prod.yml
@@ -53,4 +53,7 @@ package:
       repository_name: 'cdpxwin1809'                      # only supported ones are cdpx acr repos
       tag: 'win-ciprod'                                    # OPTIONAL: Defaults to latest. The tag for the built image. Final tag will be 1.0.0alpha, 1.0.0-timestamp-commitID.
       latest: false                                       # OPTIONAL: Defaults to false. If tag is not set to latest and this flag is set, then tag as latest as well and push latest as well.
+      publish_unique_tag: true                            # If set, the image in the registry is tagged with the unique tag generated by CDPx 
+      metadata_file:
+        artifact_path: 'windows-image-meta.json'            # If defined, the drop outputs relative path to the file into which JSON metadata about the created image is emitted.
       export_to_artifact_path: 'agentimage.tar.zip'   # path for exported image and use this instead of fixed tag
diff --git a/deployment/agent-deployment/ServiceGroupRoot/ServiceModels/Public.ServiceModel.json b/deployment/agent-deployment/ServiceGroupRoot/ServiceModels/Public.ServiceModel.json
index b7bd4aa26..8c5c7c1b6 100644
--- a/deployment/agent-deployment/ServiceGroupRoot/ServiceModels/Public.ServiceModel.json
+++ b/deployment/agent-deployment/ServiceGroupRoot/ServiceModels/Public.ServiceModel.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.2",
       "ServiceMetadata": {
         "ServiceGroup": "ContainerInsightsAgent",
-        "Environment": "Dev"
+        "Environment": "Prod"
       },
       "ServiceResourceGroupDefinitions": [
         {
@@ -30,10 +30,10 @@
       ],
       "ServiceResourceGroups": [     
         {
-          "AzureResourceGroupName": "ContainerInsightsAgent-Global-Release",
+          "AzureResourceGroupName": "ContainerInsights-Agent-Release",
           "Location": "eastus2",
           "InstanceOf": "CI-Agent-ServiceResourceGroupDefinition",
-          "AzureSubscriptionId": "728bbd23-3b47-40c1-8c9a-c6c5ccd674fc",  
+          "AzureSubscriptionId": "30c56c3a-54da-46ea-b004-06eb33432687",  
           "ScopeTags": [
             {
               "Name": "Global"