diff --git a/config/scaffold/mbb/fabfile.local.yaml b/config/scaffold/mbb/fabfile.local.yaml
index ac5ec77e..78adadf6 100644
--- a/config/scaffold/mbb/fabfile.local.yaml
+++ b/config/scaffold/mbb/fabfile.local.yaml
@@ -1,9 +1,10 @@
 {% set remote_host = platform == 'mac' ? 'docker.for.mac.localhost' : '172.17.0.1' %}
+{% set is_mac = platform == 'mac-intel' or platform == 'mac-arm' %}
 dockerHosts:
   mbb:
     runLocally: true
     rootFolder: {{ rootFolder }}/projects
-{% if platform == 'mac' %}
+{% if is_mac %}
     environment:
       COMPOSE_FILE: "docker-compose.yml:docker-compose-mbb.yml:../../docker-compose-nfs.yml"
 {% endif %}
@@ -11,13 +12,15 @@ dockerHosts:
 hosts:
   mbb:
     docker:
-      useNfs: {{ (platform == 'mac') ? "true" : "false" }}
+      useNfs: {{ (is_mac) ? "true" : "false" }}
+      useArm: {{ (platform == 'mac-arm') ? "true" : "false" }}
     xdebug:
       remote_host: {{ remote_host }}
     blueprint:
       xdebug:
         remote_host: {{ remote_host }}
       docker:
-        useNfs: {{ (platform == 'mac') ? "true" : "false" }}
+        useNfs: {{ (is_mac) ? "true" : "false" }}
+        useArm: {{ (platform == 'mac-arm') ? "true" : "false" }}
 
 
diff --git a/config/scaffold/mbb/mbb-base.yml b/config/scaffold/mbb/mbb-base.yml
index 5a1be8d6..a824fa72 100644
--- a/config/scaffold/mbb/mbb-base.yml
+++ b/config/scaffold/mbb/mbb-base.yml
@@ -1,10 +1,11 @@
 questions:
   platform:
-    question: "What platform are you working on (mac|linux)"
+    question: "What platform are you working on (mac-intel|mac-arm|linux)"
     type: choices
-    default: mac
+    default: mac-intel
     choices:
-      - mac
+      - mac-intel
+      - mac-arm
       - linux
   branch:
     question: "What branch should I use to checkout?"
diff --git a/src/Command/WorkspaceCreateCommand.php b/src/Command/WorkspaceCreateCommand.php
index 21c08ec2..184891ad 100644
--- a/src/Command/WorkspaceCreateCommand.php
+++ b/src/Command/WorkspaceCreateCommand.php
@@ -58,7 +58,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $url  = $this->scaffolder->getLocalScaffoldFile('mbb/mbb.yml');
         $root_folder = empty($input->getOption('output')) ? getcwd() : $input->getOption('output');
 
-        $result = $this->scaffold($url, $root_folder, $context, [], new Options());
+        $options = new Options();
+        $options->setUseCacheTokens(false);
+        $result = $this->scaffold($url, $root_folder, $context, [], $options);
         return $result->getExitCode();
     }
 }
diff --git a/src/Command/WorkspaceUpdateCommand.php b/src/Command/WorkspaceUpdateCommand.php
index 7376f8ea..6c12e03a 100644
--- a/src/Command/WorkspaceUpdateCommand.php
+++ b/src/Command/WorkspaceUpdateCommand.php
@@ -49,7 +49,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $name = basename($root_folder);
         $root_folder = dirname($root_folder);
-        $this->scaffold($url, $root_folder, $context, ['name' => $name], new Options());
+        $options = new Options();
+        $options->setUseCacheTokens(false);
+        $this->scaffold($url, $root_folder, $context, ['name' => $name], $options);
         return 0;
     }