diff --git a/arc_data_services/charts/arcdataservices/values.yaml b/arc_data_services/charts/arcdataservices/values.yaml
index 484f1f547b..cf1b0955fd 100644
--- a/arc_data_services/charts/arcdataservices/values.yaml
+++ b/arc_data_services/charts/arcdataservices/values.yaml
@@ -38,7 +38,7 @@ Azure:
     InstallerServiceAccount: ""
     RuntimeServiceAccount: ""
 systemDefaultValues:
-  image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.20.0_2023-06-13
+  image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.21.0_2023-07-11
   imagePullPolicy: Always
   imagePullSecret: arc-private-registry
   installerServiceAccount: ""
diff --git a/arc_data_services/deploy/scripts/pull-and-push-arc-data-services-images-to-private-registry.py b/arc_data_services/deploy/scripts/pull-and-push-arc-data-services-images-to-private-registry.py
index 7cbb8ff5ad..5e164018a8 100644
--- a/arc_data_services/deploy/scripts/pull-and-push-arc-data-services-images-to-private-registry.py
+++ b/arc_data_services/deploy/scripts/pull-and-push-arc-data-services-images-to-private-registry.py
@@ -54,9 +54,9 @@ def execute_cmd(cmd):
 if os.getenv("SOURCE_DOCKER_TAG") is None:
     SOURCE_DOCKER_TAG = (
         input(
-            "Provide container image tag for the images at the source - press ENTER for using 'v1.20.0_2023-06-13': "
+            "Provide container image tag for the images at the source - press ENTER for using 'v1.21.0_2023-07-11': "
         )
-        or "v1.20.0_2023-06-13"
+        or "v1.21.0_2023-07-11"
     )
 else:
     SOURCE_DOCKER_TAG = os.environ["SOURCE_DOCKER_TAG"]
diff --git a/arc_data_services/deploy/yaml/bootstrapper-unified.yaml b/arc_data_services/deploy/yaml/bootstrapper-unified.yaml
index a745315183..d372d8d64d 100644
--- a/arc_data_services/deploy/yaml/bootstrapper-unified.yaml
+++ b/arc_data_services/deploy/yaml/bootstrapper-unified.yaml
@@ -331,11 +331,11 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: bootstrapper
-        image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.20.0_2023-06-13    
+        image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.21.0_2023-07-11
         imagePullPolicy: Always
         args:
         - -image
-        - mcr.microsoft.com/arcdata/arc-bootstrapper:v1.20.0_2023-06-13 
+        - mcr.microsoft.com/arcdata/arc-bootstrapper:v1.21.0_2023-07-11
         - -policy
         - Always
         - -chart
diff --git a/arc_data_services/deploy/yaml/bootstrapper.yaml b/arc_data_services/deploy/yaml/bootstrapper.yaml
index 91dfaf1191..1e8fc96109 100644
--- a/arc_data_services/deploy/yaml/bootstrapper.yaml
+++ b/arc_data_services/deploy/yaml/bootstrapper.yaml
@@ -9,11 +9,11 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: bootstrapper
-        image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.20.0_2023-06-13 
+        image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.21.0_2023-07-11
         imagePullPolicy: Always
         args:
         - -image
-        - mcr.microsoft.com/arcdata/arc-bootstrapper:v1.20.0_2023-06-13
+        - mcr.microsoft.com/arcdata/arc-bootstrapper:v1.21.0_2023-07-11
         - -policy
         - Always
         - -chart
diff --git a/arc_data_services/deploy/yaml/data-controller.yaml b/arc_data_services/deploy/yaml/data-controller.yaml
index d195b4f155..331b10c7c4 100644
--- a/arc_data_services/deploy/yaml/data-controller.yaml
+++ b/arc_data_services/deploy/yaml/data-controller.yaml
@@ -30,7 +30,7 @@ spec:
     serviceAccount: sa-arc-controller
   docker:
     imagePullPolicy: Always
-    imageTag: v1.20.0_2023-06-13
+    imageTag: v1.21.0_2023-07-11
     registry: mcr.microsoft.com
     repository: arcdata
   infrastructure: other # Must be a value in the array [alibaba, aws, azure, gcp, onpremises, other]
diff --git a/arc_data_services/deploy/yaml/uninstall.yaml b/arc_data_services/deploy/yaml/uninstall.yaml
index fbbcf4a18e..2f796e4749 100644
--- a/arc_data_services/deploy/yaml/uninstall.yaml
+++ b/arc_data_services/deploy/yaml/uninstall.yaml
@@ -9,7 +9,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: bootstrapper
-        image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.20.0_2023-06-13
+        image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.21.0_2023-07-11
         imagePullPolicy: IfNotPresent
         args: ["-uninstall"]
         command: ["/opt/bootstrapper/bin/bootstrapper"]
diff --git a/arc_data_services/test/launcher/base/kustomization.yaml b/arc_data_services/test/launcher/base/kustomization.yaml
index fe27bb2a6c..a986d85280 100644
--- a/arc_data_services/test/launcher/base/kustomization.yaml
+++ b/arc_data_services/test/launcher/base/kustomization.yaml
@@ -10,4 +10,4 @@ secretGenerator:
 images:
 - name: arc-ci-launcher
   newName: mcr.microsoft.com/arcdata/arc-ci-launcher
-  newTag: v1.20.0_2023-06-13
\ No newline at end of file
+  newTag: v1.21.0_2023-07-11
\ No newline at end of file
diff --git a/arc_data_services/upgrade/yaml/bootstrapper-upgrade-job.yaml b/arc_data_services/upgrade/yaml/bootstrapper-upgrade-job.yaml
index f952e0e7f4..9da68aead8 100644
--- a/arc_data_services/upgrade/yaml/bootstrapper-upgrade-job.yaml
+++ b/arc_data_services/upgrade/yaml/bootstrapper-upgrade-job.yaml
@@ -11,10 +11,10 @@ spec:
       - name: your-private-registry
       containers:
       - name: bootstrapper
-        image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.20.0_2023-06-13
+        image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.21.0_2023-07-11
         imagePullPolicy: Always
         command: ["/opt/bootstrapper/bin/bootstrapper"]
-        args: ["-image", "mcr.microsoft.com/arcdata/arc-bootstrapper:v1.20.0_2023-06-13", "-policy", "Always", "-chart", "/opt/helm/arcdataservices", "-bootstrap"]
+        args: ["-image", "mcr.microsoft.com/arcdata/arc-bootstrapper:v1.21.0_2023-07-11", "-policy", "Always", "-chart", "/opt/helm/arcdataservices", "-bootstrap"]
         resources:
           limits:
             cpu: 200m
diff --git a/arc_data_services/upgrade/yaml/data-controller-upgrade.yaml b/arc_data_services/upgrade/yaml/data-controller-upgrade.yaml
index 90e95320c4..da1320a987 100644
--- a/arc_data_services/upgrade/yaml/data-controller-upgrade.yaml
+++ b/arc_data_services/upgrade/yaml/data-controller-upgrade.yaml
@@ -4,4 +4,4 @@ metadata:
   name: arc
 spec:
   docker:
-    imageTag: v1.20.0_2023-06-13
+    imageTag: v1.21.0_2023-07-11
diff --git a/arc_data_services/upgrade/yaml/request_body/request-body-after.yaml b/arc_data_services/upgrade/yaml/request_body/request-body-after.yaml
index 9f03d771ee..6fe4ac3e65 100644
--- a/arc_data_services/upgrade/yaml/request_body/request-body-after.yaml
+++ b/arc_data_services/upgrade/yaml/request_body/request-body-after.yaml
@@ -27,7 +27,7 @@
         },
         "docker": {
           "imagePullPolicy": "Always",
-          "imageTag": "v1.20.0_2023-06-13",
+          "imageTag": "v1.21.0_2023-07-11",
           "registry": "<registry>",
           "repository": "<repository>"
         },
diff --git a/arc_data_services/upgrade/yaml/request_body/request-body-before.yaml b/arc_data_services/upgrade/yaml/request_body/request-body-before.yaml
index 0b0fbac465..4732c2ee25 100644
--- a/arc_data_services/upgrade/yaml/request_body/request-body-before.yaml
+++ b/arc_data_services/upgrade/yaml/request_body/request-body-before.yaml
@@ -25,7 +25,7 @@
         },
         "docker": {
           "imagePullPolicy": "Always",
-          "imageTag": "v1.20.0_2023-06-13",
+          "imageTag": "v1.21.0_2023-07-11",
           "registry": "<registry>",
           "repository": "<repository>"
         },
diff --git a/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1
index 0815fe1953..0fc2d94f1d 100644
--- a/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1
+++ b/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1
@@ -116,7 +116,7 @@ az k8s-extension create --name arc-data-services `
                         --resource-group $Env:resourceGroup `
                         --auto-upgrade false `
                         --scope cluster `
-                        --version 1.18.0 `
+                        --version 1.21.0 `
                         --release-namespace arc `
                         --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper
 
diff --git a/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1
index 64e336f85f..b588ab5a2e 100644
--- a/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1
+++ b/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1
@@ -135,7 +135,7 @@ az k8s-extension create --name arc-data-services `
                         --resource-group $Env:resourceGroup `
                         --auto-upgrade false `
                         --scope cluster `
-                        --version 1.18.0 `
+                        --version 1.21.0 `
                         --release-namespace arc `
                         --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper `
 
@@ -229,7 +229,7 @@ az k8s-extension create --name arc-data-services `
                         --resource-group $Env:resourceGroup `
                         --auto-upgrade false `
                         --scope cluster `
-                        --version 1.18.0 `
+                        --version 1.21.0 `
                         --release-namespace arc `
                         --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper `
 
diff --git a/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1
index f1e636c6e3..4cc2d4894c 100644
--- a/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1
+++ b/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1
@@ -224,7 +224,7 @@ az k8s-extension create --name arc-data-services `
                         --resource-group $Env:resourceGroup `
                         --auto-upgrade false `
                         --scope cluster `
-                        --version 1.18.0 `
+                        --version 1.21.0 `
                         --release-namespace arc `
                         --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper `
 
diff --git a/azure_arc_data_jumpstart/aro/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/aro/ARM/artifacts/DataServicesLogonScript.ps1
index ad4e030d29..5bbf953e48 100644
--- a/azure_arc_data_jumpstart/aro/ARM/artifacts/DataServicesLogonScript.ps1
+++ b/azure_arc_data_jumpstart/aro/ARM/artifacts/DataServicesLogonScript.ps1
@@ -155,7 +155,7 @@ az k8s-extension create --name arc-data-services `
                         --resource-group $Env:resourceGroup `
                         --auto-upgrade false `
                         --scope cluster `
-                        --version 1.20.0 `
+                        --version 1.21.0 `
                         --release-namespace arc `
                         --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper
 
diff --git a/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1
index cc558af254..3d352a32b5 100644
--- a/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1
+++ b/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1
@@ -110,7 +110,7 @@ az k8s-extension create --name arc-data-services `
                         --resource-group $Env:resourceGroup `
                         --auto-upgrade false `
                         --scope cluster `
-                        --version 1.18.0 `
+                        --version 1.21.0 `
                         --release-namespace arc `
                         --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper `
 
diff --git a/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1
index f88717531a..7a70662759 100644
--- a/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1
+++ b/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1
@@ -134,7 +134,7 @@ az k8s-extension create --name arc-data-services `
                         --resource-group $Env:resourceGroup `
                         --auto-upgrade false `
                         --scope cluster `
-                        --version 1.18.0 `
+                        --version 1.21.0 `
                         --release-namespace arc `
                         --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper
 
diff --git a/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1
index 0d3d2badaf..d29b1688c8 100644
--- a/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1
+++ b/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1
@@ -123,7 +123,7 @@ az k8s-extension create --name arc-data-services `
                         --resource-group $env:resourceGroup `
                         --auto-upgrade false `
                         --scope cluster `
-                        --version 1.18.0 `
+                        --version 1.21.0 `
                         --release-namespace arc `
                         --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper `
 
diff --git a/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1
index 312aed6443..37bd9d1ae4 100644
--- a/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1
+++ b/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1
@@ -146,7 +146,7 @@ az k8s-extension create --name arc-data-services `
                         --resource-group $Env:resourceGroup `
                         --auto-upgrade false `
                         --scope cluster `
-                        --version 1.18.0 `
+                        --version 1.21.0 `
                         --release-namespace arc `
                         --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper
 
diff --git a/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1
index f9fac04ace..e13876e6aa 100644
--- a/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1
+++ b/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1
@@ -112,7 +112,7 @@ az k8s-extension create --name arc-data-services `
                         --resource-group $Env:resourceGroup `
                         --auto-upgrade false `
                         --scope cluster `
-                        --version 1.18.0 `
+                        --version 1.21.0 `
                         --release-namespace arc `
                         --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper `
 
diff --git a/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 b/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1
index ab4077f282..5cbd8a00f7 100644
--- a/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1
+++ b/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1
@@ -192,7 +192,7 @@ foreach ($cluster in $clusters) {
             --auto-upgrade false `
             --scope cluster `
             --release-namespace arc `
-            --version 1.18.0 `
+            --version 1.21.0 `
             --config Microsoft.CustomLocation.ServiceAccount=sa-bootstrapper
 
         Write-Host "`n"
diff --git a/azure_jumpstart_arcbox/artifacts/DataServicesLogonScript.ps1 b/azure_jumpstart_arcbox/artifacts/DataServicesLogonScript.ps1
index de91a76067..fa0fbcb5da 100644
--- a/azure_jumpstart_arcbox/artifacts/DataServicesLogonScript.ps1
+++ b/azure_jumpstart_arcbox/artifacts/DataServicesLogonScript.ps1
@@ -99,7 +99,7 @@ az k8s-extension create --name arc-data-services `
                         --resource-group $Env:resourceGroup `
                         --auto-upgrade false `
                         --scope cluster `
-                        --version 1.18.0 `
+                        --version 1.21.0 `
                         --release-namespace arc `
                         --config Microsoft.CustomLocation.ServiceAccount=sa-bootstrapper
 
diff --git a/azure_jumpstart_hcibox/artifacts/Deploy-SQLMI.ps1 b/azure_jumpstart_hcibox/artifacts/Deploy-SQLMI.ps1
index cf6773176d..8569f88ff1 100644
--- a/azure_jumpstart_hcibox/artifacts/Deploy-SQLMI.ps1
+++ b/azure_jumpstart_hcibox/artifacts/Deploy-SQLMI.ps1
@@ -139,7 +139,7 @@ Invoke-Command -VMName $SDNConfig.HostList[0] -Credential $adcred -ScriptBlock {
         --resource-group $using:rg `
         --auto-upgrade false `
         --scope cluster `
-        --version 1.18.0 `
+        --version 1.21.0 `
         --release-namespace arc `
         --config Microsoft.CustomLocation.ServiceAccount=sa-bootstrapper `
         --only-show-errors