diff --git a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
index 5a967fc..341f05e 100644
--- a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
+++ b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
@@ -6,9 +6,11 @@ class soc::intelmq(
   }
 
   user { 'intelmq':
-    ensure => present,
-    gid    => 'intelmq',
-    groups => 'www-data'
+    ensure     => present,
+    gid        => 'intelmq',
+    groups     => 'www-data',
+    home       => '/opt/intelmq',
+    managehome => true,
   }
 
   file { '/etc/intelmq':
@@ -16,11 +18,6 @@ class soc::intelmq(
     owner  => 'intelmq',
     group  => 'intelmq',
   }
-  file { '/opt/intelmq':
-    ensure => directory,
-    owner  => 'intelmq',
-    group  => 'intelmq',
-  }
 
   #  file { '/opt/sso/apache/groups.txt':
   #  ensure  => file,
@@ -29,7 +26,7 @@ class soc::intelmq(
 
   #sunet::apache2 
 
-  package { ['libapache2-mod-wsgi-py3', 'postgresql', 'python3-pip', 'python3-gpg']:
+  package { ['apache2', 'libapache2-mod-wsgi-py3', 'postgresql', 'python3-pip', 'python3-gpg']:
     ensure => 'latest',
   }