diff --git a/manifests/jenkins/server.pp b/manifests/jenkins/server.pp
index fcd1926..0b62bf5 100644
--- a/manifests/jenkins/server.pp
+++ b/manifests/jenkins/server.pp
@@ -1,8 +1,3 @@
 class profile::jenkins::server {
-  include profile::jenkins::apt_config
-
-  package {'jenkins':
-    ensure  => present,
-    require => Apt::Source['jenkins'],
-  }
+  include profile::jenkins::service
 }
diff --git a/manifests/jenkins/server.pp b/manifests/jenkins/service.pp
similarity index 55%
copy from manifests/jenkins/server.pp
copy to manifests/jenkins/service.pp
index fcd1926..c9b6a3b 100644
--- a/manifests/jenkins/server.pp
+++ b/manifests/jenkins/service.pp
@@ -1,8 +1,12 @@
-class profile::jenkins::server {
+class profile::jenkins::service {
   include profile::jenkins::apt_config
 
   package {'jenkins':
     ensure  => present,
     require => Apt::Source['jenkins'],
   }
+  -> service {'jenkins':
+    ensure => running,
+    enable => true,
+  }
 }
diff --git a/manifests/jenkins/worker.pp b/manifests/jenkins/worker.pp
index 6f8c29d..141c56a 100644
--- a/manifests/jenkins/worker.pp
+++ b/manifests/jenkins/worker.pp
@@ -1,3 +1,16 @@
 class profile::jenkins::worker {
   include profile::docker
+  include profile::jenkins::service
+
+  exec {'add jenkins user to docker group':
+    path    => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'],
+    command => 'gpasswd -a jenkins docker',
+    onlyif  => 'getent passwd jenkins',
+    unless  => 'getent group docker | cut -d: -f4 | grep -qE \'(^|,)jenkins(,|$)\'',
+    require => [
+      Package['docker-ce'],
+      Package['jenkins'],
+    ],
+    notify  => Service['jenkins'],
+  }
 }