diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 7caa900f..4b840c8c 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -50,29 +50,14 @@ class entropyclient {
    sunet::nagios::nrpe_check_process { 'haveged': }
 }
 
-class dockerhost {
-   class { 'sunet::dockerhost':
-      run_docker_cleanup        => true,
-      manage_dockerhost_unbound => true
-   }
-}
-
-class ubuntu_dockerhost {
-   class { 'sunet::dockerhost':
-      docker_version            => "17.03.0~ce-0~ubuntu-${::lsbdistcodename}",
-      storage_driver            => "aufs",
-      run_docker_cleanup        => true,
-      manage_dockerhost_unbound => true,
-      docker_dns                => '172.17.0.1'
-   }
-}
-
 class openstack_ubuntu_16_04_dockerhost {
    class { 'sunet::dockerhost':
-      docker_version            => "17.03.0~ce-0~ubuntu-${::lsbdistcodename}",
+      docker_version            => '17.11.0~ce-0~ubuntu',
+      docker_package_name       => 'docker-ce',
       storage_driver            => "aufs",
       run_docker_cleanup        => true,
       manage_dockerhost_unbound => true,
+      docker_network            => true
    }
 }