diff --git a/manifests/init.pp b/manifests/init.pp
index fcc6703..122fc47 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -75,6 +75,12 @@
 #                           Defaults to '/etc/mcollective/policies'.
 #   ['direct_addressing'] - Enable direct addressing.
 #                           Defaults to '0'.
+#   ['registration']      - The registration plugin to use
+#                           Defaults to 'AgentList.
+#   ['registerinterval']  - Registration interval
+#                           Defaults to '300'.
+#   ['registration_collective']    - The registration collective to use
+#                                    Defaults to undef.
 #   ['ssl_source_dir']    - Where to get certificates from.
 #                           Defaults to undef.
 #
@@ -131,6 +137,9 @@
   $cert_dir = $mcollective::params::cert_dir,
   $policies_dir = $mcollective::params::policies_dir,
   $direct_addressing = $mcollective::params::direct_addressing,
+  $registration = $mcollective::params::registration,
+  $registerinterval = $mcollective::params::registerinterval,
+  $registration_collective = undef,
   $ssl_source_dir = undef,
 ) inherits ::mcollective::params {
 
diff --git a/manifests/node.pp b/manifests/node.pp
index 37d7cb7..0fe3a21 100644
--- a/manifests/node.pp
+++ b/manifests/node.pp
@@ -63,6 +63,12 @@
 #                           Defaults to '/etc/mcollective/policies'.
 #   ['direct_addressing'] - Enable direct addressing.
 #                           Defaults to '0'.
+#   ['registration']      - The registration plugin to use
+#                           Defaults to 'AgentList.
+#   ['registerinterval']  - Registration interval
+#                           Defaults to '300'.
+#   ['registration_collective']    - The registration collective to use
+#                                    Defaults to undef.
 #   ['ssl_source_dir']    - Where to get certificates from.
 #                           Defaults to undef.
 #
@@ -113,6 +119,9 @@
   $policies_dir = $mcollective::policies_dir,
   $direct_addressing = $mcollective::direct_addressing,
   $ssl_source_dir = $mcollective::ssl_source_dir,
+  $registration = $mcollective::registration,
+  $registration_collective = $mcollective::registration_collective,
+  $registerinterval = $mcollective::registerinterval,
 ) {
 
   if !defined(Class['::mcollective']) {
diff --git a/manifests/params.pp b/manifests/params.pp
index 4792cd9..2bca86a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -29,6 +29,8 @@
   $use_node = true
   $use_client = false
   $direct_addressing = 0
+  $registration = 'Agentlist'
+  $registerinterval = 300
 
   case $::osfamily {
     'Debian': {
diff --git a/templates/server.cfg.erb b/templates/server.cfg.erb
index 7912458..b012c0c 100644
--- a/templates/server.cfg.erb
+++ b/templates/server.cfg.erb
@@ -60,6 +60,10 @@ plugin.yaml = /etc/mcollective/facts.yaml
 
 classesfile = /var/lib/puppet/state/classes.txt
 
-registerinterval = 300
-registration = Agentlist
+# Registration
+registerinterval = <%= scope.lookupvar('mcollective::node::registerinterval') %>
+registration = <%= scope.lookupvar('mcollective::node::registration') %>
+<% if scope.lookupvar('mcollective::node::registration_collective') != :undef %>
+registration_collective = <%= scope.lookupvar('mcollective::node::registration_collective') %>
+<%- end %>