diff --git a/databricks-operator/Makefile b/databricks-operator/Makefile
index 30996c4..8638339 100644
--- a/databricks-operator/Makefile
+++ b/databricks-operator/Makefile
@@ -56,7 +56,7 @@ endif
 docker-build: test
 	docker build . -t ${IMG}
 	@echo "updating kustomize image patch file for manager resource"
-	sed -i'' -e 's@image: .*@image: '"${IMG}"'@' ./config/default/manager_go_image_patch.yaml
+	sed -i'' -e 's@image: .*@image: '"${IMG}"'@' ./config/default/azure_databricks_operator_image_patch.yaml
 
 # Push the docker image
 docker-push:
diff --git a/databricks-operator/config/default/dbricks_python_image_patch.yaml b/databricks-operator/config/default/azure_databricks_api_image_patch.yaml
similarity index 79%
rename from databricks-operator/config/default/dbricks_python_image_patch.yaml
rename to databricks-operator/config/default/azure_databricks_api_image_patch.yaml
index 3740916..7da8cd3 100644
--- a/databricks-operator/config/default/dbricks_python_image_patch.yaml
+++ b/databricks-operator/config/default/azure_databricks_api_image_patch.yaml
@@ -7,8 +7,8 @@ spec:
   template:
     spec:
       containers:
-      # Change the value of image field below to your controller image URL
-      - image: azadehkhojandi/databricks-api:1
+      # Change the value of image field below to your azure databricks api image URL
+      - image: mcr.microsoft.com/azure-databricks/api:latest
         name: dbricks
         ports:
         - containerPort: 5000
diff --git a/databricks-operator/config/default/manager_go_image_patch.yaml b/databricks-operator/config/default/azure_databricks_operator_image_patch.yaml
similarity index 77%
rename from databricks-operator/config/default/manager_go_image_patch.yaml
rename to databricks-operator/config/default/azure_databricks_operator_image_patch.yaml
index 8498265..59bc62a 100644
--- a/databricks-operator/config/default/manager_go_image_patch.yaml
+++ b/databricks-operator/config/default/azure_databricks_operator_image_patch.yaml
@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: azadehkhojandi/databricks-operator
+      - image: mcr.microsoft.com/k8s/azure-databricks/operator:latest
         name: manager
diff --git a/databricks-operator/config/kustomization.yaml b/databricks-operator/config/kustomization.yaml
index aa91b02..6e6066c 100644
--- a/databricks-operator/config/kustomization.yaml
+++ b/databricks-operator/config/kustomization.yaml
@@ -29,8 +29,8 @@ resources:
 - rbac/auth_proxy_role_binding.yaml
 
 patches:
-- default/manager_go_image_patch.yaml
-- default/dbricks_python_image_patch.yaml
+- default/azure_databricks_operator_image_patch.yaml
+- default/azure_databricks_api_image_patch.yaml
   # Protect the /metrics endpoint by putting it behind auth.
   # Only one of manager_auth_proxy_patch.yaml and
   # manager_prometheus_metrics_patch.yaml should be enabled.