diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 922a1456..c41686ba 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1172,7 +1172,7 @@ web-1.qa.sveidas.se:
 log.qa.sveidas.se:
    sunet_iaas_cloud:
    eid::dockerhost:
-      version: '5:20.10.6~3-0~ubuntu-bionic'
+      version: 'version: '5:23.0.6-1~ubuntu.20.04~focal''
    eid::telegraf:
       ports: ['127.0.0.1:9999:9999']
    sunet::fticks:
diff --git a/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp b/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp
index ef41fcd0..71c7fb99 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp
@@ -36,6 +36,21 @@ class eid::nagios_monitor {
     enable  => true,
   }
 
+  exec { 'a2enconf nagios4-cgi.conf':
+    creates     => '/etc/apache2/conf-enabled/nagios4-cgi.conf',
+    notify      => Service['apache2'],
+  }
+
+  file { '/etc/apache2/conf-enabled/nagios4-cgi.conf':
+    ensure  => link,
+  }
+
+  exec { 'a2enmod auth_digest authz_groupfile':
+    subscribe   => File['/etc/apache2/conf-enabled/nagios4-cgi.conf'],
+    refreshonly => true,
+    notify      => Service['apache2'],
+  }
+
   file {
       '/root/MONITOR_WEB_PASSWORD':
         content => sprintf("%s\n%s\n", $web_admin_user, $web_admin_pw),