diff --git a/quickstart/201-machine-learning-moderately-secure/workspace.tf b/quickstart/201-machine-learning-moderately-secure/workspace.tf
index deb00941..28ddee0a 100644
--- a/quickstart/201-machine-learning-moderately-secure/workspace.tf
+++ b/quickstart/201-machine-learning-moderately-secure/workspace.tf
@@ -59,6 +59,8 @@ resource "azurerm_machine_learning_workspace" "default" {
   identity {
     type = "SystemAssigned"
   }
+  
+  image_build_compute_name = var.image_build_compute_name
 }
 
 # Private endpoints
@@ -176,15 +178,4 @@ resource "azurerm_machine_learning_compute_cluster" "image-builder" {
   identity {
     type = "SystemAssigned"
   }
-}
-
-# Update workspace for image-build-compute
-resource "null_resource" "ws_image_build_compute"{
-  provisioner "local-exec" {
-    command = <<EOF
-    az ml workspace update --resource-group ${azurerm_resource_group.default.name} --workspace-name ${azurerm_machine_learning_workspace.default.name} --image-build-compute ${azurerm_machine_learning_compute_cluster.image-builder.name}
-    
-    EOF
-  }
-  depends_on = [azurerm_machine_learning_compute_cluster.image-builder]
-}
+}
\ No newline at end of file
diff --git a/quickstart/202-machine-learning-moderately-secure-existing-VNet/workspace.tf b/quickstart/202-machine-learning-moderately-secure-existing-VNet/workspace.tf
index 936bb4b9..79ede245 100644
--- a/quickstart/202-machine-learning-moderately-secure-existing-VNet/workspace.tf
+++ b/quickstart/202-machine-learning-moderately-secure-existing-VNet/workspace.tf
@@ -59,6 +59,8 @@ resource "azurerm_machine_learning_workspace" "default" {
   identity {
     type = "SystemAssigned"
   }
+
+  image_build_compute_name = var.image_build_compute_name
 }
 
 # Private endpoints
@@ -179,15 +181,4 @@ resource "azurerm_machine_learning_compute_cluster" "image-builder" {
   identity {
     type = "SystemAssigned"
   }
-}
-
-# Update workspace for image-build-compute
-resource "null_resource" "ws_image_build_compute"{
-  provisioner "local-exec" {
-    command = <<EOF
-    az ml workspace update --resource-group ${azurerm_resource_group.default.name} --workspace-name ${azurerm_machine_learning_workspace.default.name} --image-build-compute ${azurerm_machine_learning_compute_cluster.image-builder.name}
-    
-    EOF
-  }
-  depends_on = [azurerm_machine_learning_compute_cluster.image-builder]
-}
+}
\ No newline at end of file