diff --git a/custom/lib/facter/environment.rb b/custom/lib/facter/environment.rb
new file mode 100644
index 0000000..45a3f76
--- /dev/null
+++ b/custom/lib/facter/environment.rb
@@ -0,0 +1,8 @@
+ENV.each do |k,v|
+    next if not k.downcase.start_with?("puppet_")
+    Facter.add("env_#{k.downcase}".to_sym) do
+        setcode do
+            v
+        end
+    end
+end