diff --git a/Makefile b/Makefile
index 5b25f24dc11..ddf5a50a1ac 100644
--- a/Makefile
+++ b/Makefile
@@ -742,10 +742,12 @@ verify-container-images: ## Verify container images
 .PHONY: kind-create
 kind-create: $(KUBECTL) ## Create capz kind cluster if needed.
 	./scripts/kind-with-registry.sh
+	unset MGMT_CLUSTER_TYPE
 
 .PHONY: aks-create
 aks-create: $(KUBECTL) ## Create aks cluster as mgmt cluster.
 	./scripts/aks-as-mgmt.sh
+	export MGMT_CLUSTER_TYPE=aks
 
 .PHONY: tilt-up
 tilt-up: install-tools ## Start tilt and build kind cluster if needed.
diff --git a/Tiltfile b/Tiltfile
index aa9a4927a37..3c065ac6106 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -50,8 +50,9 @@ if "allowed_contexts" in settings:
 if "default_registry" in settings:
     default_registry(settings.get("default_registry"))
 
+mgmt_cluster_type = os.getenv("MGMT_CLUSTER_TYPE", "")
 os_arch = str(local("go env GOARCH")).rstrip("\n")
-if "aks" in settings.get("kustomize_substitutions", {}).get("MGMT_CLUSTER_NAME", ""):
+if mgmt_cluster_type == "aks":
     print("Using AKS as management cluster, setting os_arch to amd64")
     os_arch = "amd64"