diff --git a/sysutils/puppet-agent/pkg-descr b/sysutils/puppet-agent/pkg-descr
index 64ec7afe9..b525dbc6e 100644
--- a/sysutils/puppet-agent/pkg-descr
+++ b/sysutils/puppet-agent/pkg-descr
@@ -9,6 +9,9 @@ WWW:  https://puppet.com/docs/puppet/latest/man/agent.html
 Plugin Changelog
 ================
 
+Changed:
+* add default values for Puppet Server + Environment
+
 1.0
 
 Added:
diff --git a/sysutils/puppet-agent/src/opnsense/mvc/app/models/OPNsense/PuppetAgent/PuppetAgent.xml b/sysutils/puppet-agent/src/opnsense/mvc/app/models/OPNsense/PuppetAgent/PuppetAgent.xml
index f706d65a5..854add779 100644
--- a/sysutils/puppet-agent/src/opnsense/mvc/app/models/OPNsense/PuppetAgent/PuppetAgent.xml
+++ b/sysutils/puppet-agent/src/opnsense/mvc/app/models/OPNsense/PuppetAgent/PuppetAgent.xml
@@ -1,19 +1,19 @@
 <model>
     <mount>//OPNsense/puppetagent</mount>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <description>Manage Puppet Agent service</description>
     <items>
-        <!-- container -->
         <general>
-            <!-- fields -->
             <Enabled type="BooleanField">
                 <default>0</default>
                 <Required>Y</Required>
             </Enabled>
             <FQDN type="HostnameField">
+                <default>puppet</default>
                 <Required>Y</Required>
             </FQDN>
             <Environment type="TextField">
+                <default>production</default>
                 <Required>Y</Required>
                 <mask>/^.{1,100}$/u</mask>
                 <ValidationMessage>Should be a string between 1 and 100 characters.</ValidationMessage>