diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index a694df04..3721de6a 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -23,6 +23,7 @@ r1.komreg.net:
    sunet_iaas_cloud:
    autoupdate:
    sunet::dehydrated:
+   openstack_dockerhost:
    md_repo_server:
       hostname: r1.komreg.net
 
@@ -42,7 +43,7 @@ p1.komreg.net:
 '^md[\-0-9].+\.komreg\.net$':
    sunet_iaas_cloud:
    autoupdate:
-   openstack_ubuntu_16_04_dockerhost:
+   openstack_dockerhost:
    konsulter:
    md_repo_client:
 
@@ -52,7 +53,7 @@ md1.komreg.net:
       dest_host: p1.komreg.net
 
 '^eidas-node-[0-9]+\.qa\.sveidas\.se$':
-   openstack_ubuntu_16_04_dockerhost:
+   openstack_dockerhost:
    konsulter:
    sunet_iaas_cloud:
    autoupdate:
@@ -67,7 +68,7 @@ md1.komreg.net:
          port: '443'
 
 '^eidas-proxy-[0-9]+\.qa\.sveidas\.se$':
-   openstack_ubuntu_16_04_dockerhost:
+   openstack_dockerhost:
    konsulter:
    sunet_iaas_cloud:
    autoupdate:
@@ -83,7 +84,7 @@ md1.komreg.net:
          port: '443'
 
 '^prid-[0-9]+\.qa\.sveidas\.se$':
-   openstack_ubuntu_16_04_dockerhost:
+   openstack_dockerhost:
    konsulter:
    sunet_iaas_cloud:
    autoupdate:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 2e236f05..f2812f93 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -51,9 +51,9 @@ class entropyclient {
    sunet::nagios::nrpe_check_process { 'haveged': }
 }
 
-class openstack_ubuntu_16_04_dockerhost {
+class openstack_dockerhost {
    class { 'sunet::dockerhost':
-      docker_version            => '17.11.0~ce-0~ubuntu',
+      docker_version            => '17.12.0~ce-0~ubuntu',
       docker_package_name       => 'docker-ce',
       storage_driver            => "aufs",
       run_docker_cleanup        => true,
@@ -192,7 +192,6 @@ class md_publisher(Array $allow_clients=['any'], $keyname=undef, String $dir="/v
 }
 
 class md_repo_server($hostname) {
-   class {'openstack_ubuntu_16_04_dockerhost': } ->
    class {'sunet::gitolite': } ->
    sunet::docker_run {'gitweb':
       image    => 'docker.sunet.se/gitweb',