diff --git a/roles/jenkins/master/tasks/main.yml b/roles/jenkins/master/tasks/main.yml
index a5a9c74064..ff12f47d70 100644
--- a/roles/jenkins/master/tasks/main.yml
+++ b/roles/jenkins/master/tasks/main.yml
@@ -3,5 +3,13 @@
   with_items:
   - jenkins
   tags:
+  - jenkins
   - jenkins/master
   - packages
+
+- name: enable jenkins service to start on boot
+  action: service name=jenkins state=running enabled=true
+  tags:
+  - jenkins
+  - jenkins/master
+  - service
diff --git a/roles/jenkins/slave/tasks/main.yml b/roles/jenkins/slave/tasks/main.yml
index 73fbade17a..8461eb8472 100644
--- a/roles/jenkins/slave/tasks/main.yml
+++ b/roles/jenkins/slave/tasks/main.yml
@@ -2,6 +2,8 @@
   yum: name={{ item }} state=installed
   with_items:
   - java-1.8.0-openjdk-devel
+  # TODO: install more packages (copy from jenkins-cloud.yml)
   tags:
+  - jenkins
   - jenkins/slave
   - packages