diff --git a/manifests/agent.pp b/manifests/agent.pp
index fc2d000..fc873c3 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -9,7 +9,7 @@ class puppet::agent (
   $maxsleep        = '3200',
   $puppet_master   = undef,
   $cron            = true,
-  $environment     = gsub($::domain, '.lan', '')) {
+  $environment     = gsub($::domain, '.(lan|mysportgroup\.de)', '')) {
   case $::kernel {
     'Linux' : {
       $puppetpkgs = ['puppet', 'puppet-common']
diff --git a/templates/puppet.conf.erb b/templates/puppet.conf.erb
index f0a7e2f..f79777a 100644
--- a/templates/puppet.conf.erb
+++ b/templates/puppet.conf.erb
@@ -38,4 +38,4 @@ splay=true
 report=true
 server=<%= scope.lookupvar("puppetmaster_server") %>
 configtimeout=720
-environment=<% @domain.gsub('.(lan|mysportgroup.de)','')
+environment=<%= @environment %>