diff --git a/manifests/hosts/forskarmatch2.pp b/manifests/hosts/forskarmatch2.pp
new file mode 100644
index 0000000000000000000000000000000000000000..52385c16a7606a8229a418fed752cd1299dddbbb
--- /dev/null
+++ b/manifests/hosts/forskarmatch2.pp
@@ -0,0 +1,7 @@
+class kmaccess::forskarmatch2 {
+  package { 'docker':
+    ensure => 'installed',
+    before => User['kmaccess'],
+  }
+  User <| title == 'kmaccess' |> { groups +> 'docker' }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index c6737b15a30cabaaf75f8fcae1fb0a42f2a0b197..b076635062ad9afc60069c545779059f80a00743 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,18 +12,20 @@ class kmaccess {
     include $cfg
   }
   profiles::letsencrypt::cert { $fqdn : }
-  user { 'kmaccess' :
+  @user { 'kmaccess' :
     ensure => 'present',
     shell  => '/sbin/nologin',
     home   => '/opt/liu/kmaccess',
-    groups => 'docker',
+    groups => [],
     system => true,
-  } ->
+  } 
+  User <| title == 'kmaccess' |>
   file { '/opt/liu/kmaccess' :
-    ensure => 'directory',
-    owner  => 'kmaccess',
-    group  => 'kmaccess',
-    mode   => '0755',
+    ensure  => 'directory',
+    owner   => 'kmaccess',
+    group   => 'kmaccess',
+    mode    => '0755',
+    require => User['kmaccess'],
   }
   file { '/etc/sudoers.d/02-kmaccess' :
     ensure => 'present',