diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 0dbcc48d..dcad00b5 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -218,7 +218,17 @@ class md_publisher(Array $allow_clients=['any'], $keyname=undef, String $dir="/v
 }
 
 class md_repo_server($hostname) {
-   class {'sunet::gitolite': } ->
+   ensure_resource('sunet::system_user', 'www-data', {
+      username   => 'www-data',
+      group      => 'www-data',
+      managehome => false,
+      shell      => '/bin/bash'
+   })
+   class {'sunet::gitolite': }
+   sunet::snippets::add_user_to_group { 'add_www_data_to_git':
+      username => 'www-data',
+      group    => 'git'
+   } ->
    sunet::docker_run {'gitweb':
       image    => 'docker.sunet.se/gitweb',
       imagetag => 'latest',