diff --git a/Vagrantfile b/Vagrantfile
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -40,20 +40,23 @@
     "vagrant_testing" => "1",
     "testing"         => "vagrant",
     "deployment"      => ENV_ADMIN,
-    "subnet"          => "vagrant"
+    "subnet"          => "vagrant",
+    "environment"     => ENV_PRODUCTION,
   },
   ENV_PRODUCTION => {
     "vagrant_testing" => "1",
     "testing"         => "vagrant",
     "deployment"      => ENV_PRODUCTION,
     "subnet"          => "vagrant",
-    "puppet_vardir"   => "/var/lib/puppet"
+    "puppet_vardir"   => "/var/lib/puppet",
+    "environment"     => ENV_PRODUCTION,
   },
   ENV_STAGING => {
     "vagrant_testing" => "1",
     "testing"         => "vagrant",
     "deployment"      => ENV_STAGING,
-    "subnet"          => "vagrant"
+    "subnet"          => "vagrant",
+    "environment"     => ENV_STAGING,
   },
 }
 
@@ -452,7 +455,7 @@
       end
 
       config.vm.provision "puppet" do |puppet|
-        puppet.environment = _environment
+        puppet.environment = _facts["environment"]
         if vm_props[:type] == TYPE_AGENT
           puppet.environment_path = "#{environment_path}"
           puppet.hiera_config_path = "#{puppet.environment_path}/#{puppet.environment}/hiera.yaml"