diff --git a/global/overlay/etc/puppet/modules/soc/files/intelmq/install-intelmq.sh b/global/overlay/etc/puppet/modules/soc/files/intelmq/install-intelmq.sh
index 0f1d7f4..9906122 100644
--- a/global/overlay/etc/puppet/modules/soc/files/intelmq/install-intelmq.sh
+++ b/global/overlay/etc/puppet/modules/soc/files/intelmq/install-intelmq.sh
@@ -24,4 +24,6 @@ pip3 install $PY_CERTBUND_CONTACT
 # Due to Certbund contact overwrite files for some reason, reinstall intelmq
 pip3 install --force-reinstall intelmq
 
+intelmq-manager-build -o /opt/intelmq/www/intelmq-manager
+
 touch /opt/intelmq/.installed
diff --git a/global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-vhost.conf.erb b/global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-vhost.conf.erb
index e2f787b..5aba89e 100644
--- a/global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-vhost.conf.erb
+++ b/global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-vhost.conf.erb
@@ -56,8 +56,8 @@
             Options FollowSymLinks
         </Directory>
 
-        Alias /intelmq-manager /usr/share/intelmq_manager/html/
-        <Directory /usr/share/intelmq_manager/html>
+        Alias /intelmq-manager /opt/intelmq/www/intelmq-manager
+        <Directory /opt/intelmq/www/intelmq-manager> 
 #                AuthType                Basic
 #                AuthName                "IntelMQ"
 #                AuthBasicProvider       file