diff --git a/defaults/main.yml b/defaults/main.yml
index cb90316..8d49dd6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,6 @@
 ---
 # defaults file for ansible-puppet
+copy_hieradata: false
+copy_puppet: false
+hieradata: /etc/puppet/hieradata
+puppet_environment: production
diff --git a/vars/main.yml b/vars/main.yml
index 5ebc5ab..3856fd2 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,6 +1,2 @@
 ---
 # vars file for ansible-puppet
-copy_hieradata: false
-copy_puppet: false
-hieradata: /etc/puppet/hieradata
-puppet_environment: production