diff --git a/FhirToDataLake/deploy/templates/ContainerApp/DeployDicomPipelineToContainerApp.json b/FhirToDataLake/deploy/templates/ContainerApp/DeployDicomPipelineToContainerApp.json
index cea1dabc..e0ffd1fd 100644
--- a/FhirToDataLake/deploy/templates/ContainerApp/DeployDicomPipelineToContainerApp.json
+++ b/FhirToDataLake/deploy/templates/ContainerApp/DeployDicomPipelineToContainerApp.json
@@ -83,7 +83,7 @@
     },
     "image": {
         "type": "string",
-        "defaultValue": "healthplatformregistry.azurecr.io/fhirtodatalaketool:v0.5.0",
+        "defaultValue": "healthplatformregistry.azurecr.io/healthdatatodatalaketool:v0.6.0",
         "metadata": {
             "description": "Container image to deploy. Should be of the form repoName/imagename:tag for images stored in public Docker Hub, or a fully qualified URI for other registries. Images from private registries require additional registry credentials."
         }
@@ -119,7 +119,7 @@
     "jobInfoQueueName": "[concat(variables('pipelineName'), 'jobinfoqueue')]",
     "jobInfoTableName": "[concat(variables('pipelineName'), 'jobinfotable')]",
     "metadataTableName": "[concat(variables('pipelineName'), 'metadatatable')]",
-    "resourceTags": {"FhirAnalyticsPipeline": "DicomToDataLake", "FhirSchemaVersion": "v0.5.0"},
+    "resourceTags": {"FhirAnalyticsPipeline": "DicomToDataLake", "FhirSchemaVersion": "v0.6.0"},
     "storageAccountName": "[concat(substring(replace(variables('pipelineName'), '-', ''), 0, min(11, length(replace(variables('pipelineName'), '-', '')))), uniquestring(resourceGroup().id, variables('pipelineName')))]",
     "storageBlobDataContributerRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe')]",
     "storageQueueDataContributerRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', '974c5e8b-45b9-4653-ba55-5f855dd0fb88')]",
diff --git a/FhirToDataLake/deploy/templates/ContainerApp/DeployFhirPipelineToContainerApp.json b/FhirToDataLake/deploy/templates/ContainerApp/DeployFhirPipelineToContainerApp.json
index ac0b8c16..badae3eb 100644
--- a/FhirToDataLake/deploy/templates/ContainerApp/DeployFhirPipelineToContainerApp.json
+++ b/FhirToDataLake/deploy/templates/ContainerApp/DeployFhirPipelineToContainerApp.json
@@ -135,7 +135,7 @@
     },
     "image": {
         "type": "string",
-        "defaultValue": "healthplatformregistry.azurecr.io/fhirtodatalaketool:v0.5.0",
+        "defaultValue": "healthplatformregistry.azurecr.io/healthdatatodatalaketool:v0.6.0",
         "metadata": {
             "description": "Container image to deploy. Should be of the form repoName/imagename:tag for images stored in public Docker Hub, or a fully qualified URI for other registries. Images from private registries require additional registry credentials."
         }
@@ -170,7 +170,7 @@
     "jobInfoQueueName": "[concat(variables('pipelineName'), 'jobinfoqueue')]",
     "jobInfoTableName": "[concat(variables('pipelineName'), 'jobinfotable')]",
     "metadataTableName": "[concat(variables('pipelineName'), 'metadatatable')]",
-    "resourceTags": {"FhirAnalyticsPipeline": "FhirToDataLake", "FhirSchemaVersion": "v0.5.0"},
+    "resourceTags": {"FhirAnalyticsPipeline": "FhirToDataLake", "FhirSchemaVersion": "v0.6.0"},
     "storageAccountName": "[concat(substring(replace(variables('pipelineName'), '-', ''), 0, min(11, length(replace(variables('pipelineName'), '-', '')))), uniquestring(resourceGroup().id, variables('pipelineName')))]",
     "storageBlobDataContributerRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe')]",
     "storageQueueDataContributerRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', '974c5e8b-45b9-4653-ba55-5f855dd0fb88')]",
diff --git a/FhirToDataLake/deploy/templates/Function/DeployFhirPipelineToFunction.json b/FhirToDataLake/deploy/templates/Function/DeployFhirPipelineToFunction.json
index 1901c525..04ddd0d7 100644
--- a/FhirToDataLake/deploy/templates/Function/DeployFhirPipelineToFunction.json
+++ b/FhirToDataLake/deploy/templates/Function/DeployFhirPipelineToFunction.json
@@ -168,7 +168,7 @@
         "hostingPlanName": "[variables('appName')]",
         "applicationInsightsName": "[concat('AppInsights-', variables('appName'))]",
         "deployAppInsights": "[parameters('deployAppInsights')]",
-        "resourceTags": {"FhirAnalyticsPipeline": "FhirToDataLake", "FhirSchemaVersion": "v0.5.0"},
+        "resourceTags": {"FhirAnalyticsPipeline": "FhirToDataLake", "FhirSchemaVersion": "v0.6.0"},
         "storageAccountName": "[concat(substring(replace(variables('appName'), '-', ''), 0, min(11, length(replace(variables('appName'), '-', '')))), uniquestring(resourceGroup().id, variables('appName')))]",
         "storageBlobDataContributorRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe')]",
         "storageQueueDataContributorRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', '974c5e8b-45b9-4653-ba55-5f855dd0fb88')]",
diff --git a/FhirToDataLake/scripts/Set-SynapseEnvironment.ps1 b/FhirToDataLake/scripts/Set-SynapseEnvironment.ps1
index d3f6adb0..85886421 100644
--- a/FhirToDataLake/scripts/Set-SynapseEnvironment.ps1
+++ b/FhirToDataLake/scripts/Set-SynapseEnvironment.ps1
@@ -57,7 +57,7 @@ Param(
 # TODO: Align Tags here and ARM template, maybe save schemas in Storage/ACR and run remotely.
 $Tags = @{
     "FhirAnalyticsPipeline" = "FhirToDataLake"
-    "FhirSchemaVersion" = "v0.5.0"
+    "FhirSchemaVersion" = "v0.6.0"
 }
 
 $JobName = "FhirSynapseJob"