diff --git a/src/ubuntu/build.native.pkr.hcl b/src/ubuntu/build.native.pkr.hcl
index f6783b572..b64e81c86 100644
--- a/src/ubuntu/build.native.pkr.hcl
+++ b/src/ubuntu/build.native.pkr.hcl
@@ -52,14 +52,10 @@ build {
 
   provisioner "shell-local" {
     inline = [
-      "chef install",
+      "chef install --chef-license accept-silent",
       "chef update --attributes",
       "chef export ${local.artifacts_directory}/chef --force"
     ]
-
-    env = {
-      CHEF_LICENSE = "accept-silent"
-    }
   }
 }
 
diff --git a/src/ubuntu/build.vagrant.pkr.hcl b/src/ubuntu/build.vagrant.pkr.hcl
index 3e76066ea..aa967049d 100644
--- a/src/ubuntu/build.vagrant.pkr.hcl
+++ b/src/ubuntu/build.vagrant.pkr.hcl
@@ -105,21 +105,19 @@ build {
     valid_exit_codes = [0, 1]
 
     env = {
-      VAGRANT_DEFAULT_PROVIDER = "${lookup(local.vagrant_providers, local.image_provider, "")}"
-      VAGRANT_BOX_URL          = "${local.artifacts_directory}/vagrant/vagrant.box"
+      VAGRANT_BOX_URL = "${local.artifacts_directory}/vagrant/vagrant.box"
     }
   }
 
   provisioner "shell-local" {
     inline = [
-      "vagrant up local"
+      "vagrant up local --provider ${lookup(local.vagrant_providers, local.image_provider, "")}"
     ]
 
     max_retries = 1
 
     env = {
-      VAGRANT_DEFAULT_PROVIDER = "${lookup(local.vagrant_providers, local.image_provider, "")}"
-      VAGRANT_BOX_URL          = "${local.artifacts_directory}/vagrant/vagrant.box"
+      VAGRANT_BOX_URL = "${local.artifacts_directory}/vagrant/vagrant.box"
     }
   }
 
@@ -132,8 +130,7 @@ build {
     valid_exit_codes = [0, 1]
 
     env = {
-      VAGRANT_DEFAULT_PROVIDER = "${lookup(local.vagrant_providers, local.image_provider, "")}"
-      VAGRANT_BOX_URL          = "${local.artifacts_directory}/vagrant/vagrant.box"
+      VAGRANT_BOX_URL = "${local.artifacts_directory}/vagrant/vagrant.box"
     }
   }
 }
diff --git a/src/windows/build.native.pkr.hcl b/src/windows/build.native.pkr.hcl
index 8921c40b4..5a4f00609 100644
--- a/src/windows/build.native.pkr.hcl
+++ b/src/windows/build.native.pkr.hcl
@@ -53,14 +53,10 @@ build {
 
   provisioner "shell-local" {
     inline = [
-      "chef install",
+      "chef install --chef-license accept-silent",
       "chef update --attributes",
       "chef export ${local.artifacts_directory}/chef --force"
     ]
-
-    env = {
-      CHEF_LICENSE = "accept-silent"
-    }
   }
 }
 
diff --git a/src/windows/build.vagrant.pkr.hcl b/src/windows/build.vagrant.pkr.hcl
index 0d3ecaced..ddf718989 100644
--- a/src/windows/build.vagrant.pkr.hcl
+++ b/src/windows/build.vagrant.pkr.hcl
@@ -110,21 +110,19 @@ build {
     valid_exit_codes = [0, 1]
 
     env = {
-      VAGRANT_DEFAULT_PROVIDER = "${lookup(local.vagrant_providers, local.image_provider, "")}"
-      VAGRANT_BOX_URL          = "${local.artifacts_directory}/vagrant/vagrant.box"
+      VAGRANT_BOX_URL = "${local.artifacts_directory}/vagrant/vagrant.box"
     }
   }
 
   provisioner "shell-local" {
     inline = [
-      "vagrant up local"
+      "vagrant up local --provider ${lookup(local.vagrant_providers, local.image_provider, "")}"
     ]
 
     max_retries = 1
 
     env = {
-      VAGRANT_DEFAULT_PROVIDER = "${lookup(local.vagrant_providers, local.image_provider, "")}"
-      VAGRANT_BOX_URL          = "${local.artifacts_directory}/vagrant/vagrant.box"
+      VAGRANT_BOX_URL = "${local.artifacts_directory}/vagrant/vagrant.box"
     }
   }
 
@@ -137,8 +135,7 @@ build {
     valid_exit_codes = [0, 1]
 
     env = {
-      VAGRANT_DEFAULT_PROVIDER = "${lookup(local.vagrant_providers, local.image_provider, "")}"
-      VAGRANT_BOX_URL          = "${local.artifacts_directory}/vagrant/vagrant.box"
+      VAGRANT_BOX_URL = "${local.artifacts_directory}/vagrant/vagrant.box"
     }
   }
 }