diff --git a/pillar/id/jenkins-agent_infra_opensuse_org.sls b/pillar/id/jenkins-agent_infra_opensuse_org.sls
new file mode 100644
index 0000000..563120f
--- /dev/null
+++ b/pillar/id/jenkins-agent_infra_opensuse_org.sls
@@ -0,0 +1,19 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - jenkins agent
+  roles:
+    - worker_jenkins
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: Testing machhine to serve as a Jenkins Agent.
+  documentation:
+    - https://jenkins.io/
+  responsible:
+    - luc14n0
+  partners: []
+  weburls: []
diff --git a/pillar/id/jenkins_infra_opensuse_org.sls b/pillar/id/jenkins_infra_opensuse_org.sls
index 111386a..3894f47 100644
--- a/pillar/id/jenkins_infra_opensuse_org.sls
+++ b/pillar/id/jenkins_infra_opensuse_org.sls
@@ -2,9 +2,11 @@ grains:
   city: nuremberg
   country: de
   hostusage:
-    - jenkins
+    - jenkins controller
+    - jenkins agent
   roles:
-    - jenkins
+    - web_jenkins
+    - worker_jenkins
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
diff --git a/pillar/role/jenkins.sls b/pillar/role/jenkins.sls
deleted file mode 100644
index 373489e..0000000
--- a/pillar/role/jenkins.sls
+++ /dev/null
@@ -1,16 +0,0 @@
-include:
-  - role.common.nginx
-
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_jenkins-admins:
-      groups:
-        jenkins-admins:
-          - 'ALL=(ALL) ALL'
-
-zypper:
-  repositories:
-    devel:tools:building:
-      baseurl: http://download.opensuse.org/repositories/devel:/tools:/building/$releasever/
-      priority: 100
-      refresh: True
diff --git a/pillar/role/web_jenkins.sls b/pillar/role/web_jenkins.sls
new file mode 100644
index 0000000..373489e
--- /dev/null
+++ b/pillar/role/web_jenkins.sls
@@ -0,0 +1,16 @@
+include:
+  - role.common.nginx
+
+sudoers:
+  included_files:
+    /etc/sudoers.d/group_jenkins-admins:
+      groups:
+        jenkins-admins:
+          - 'ALL=(ALL) ALL'
+
+zypper:
+  repositories:
+    devel:tools:building:
+      baseurl: http://download.opensuse.org/repositories/devel:/tools:/building/$releasever/
+      priority: 100
+      refresh: True
diff --git a/pillar/role/worker_jenkins.sls b/pillar/role/worker_jenkins.sls
new file mode 100644
index 0000000..819b377
--- /dev/null
+++ b/pillar/role/worker_jenkins.sls
@@ -0,0 +1,16 @@
+# include:
+  #  - role.jenkins
+
+sudoers:
+  included_files:
+    /etc/sudoers.d/group_jenkins-admins:
+      groups:
+        jenkins-admins:
+          - 'ALL=(ALL) ALL'
+
+zypper:
+  repositories:
+    devel:tools:building:
+      baseurl: http://download.opensuse.org/repositories/devel:/tools:/building/$releasever/
+      priority: 100
+      refresh: True
diff --git a/salt/profile/jenkins/init.sls b/salt/profile/jenkins/init.sls
new file mode 100644
index 0000000..ded688f
--- /dev/null
+++ b/salt/profile/jenkins/init.sls
@@ -0,0 +1,16 @@
+jenkins_pkgs:
+  pkg.installed:
+    - pkgs:
+      - jenkins-lts
+
+jenkins_target:
+  service.running:
+    - name: jenkins.target
+    - enable: True
+
+jenkins_restart:
+  module.wait:
+    - name: service.restart
+    - m_name: jenkins.target
+    - require:
+      - service: jenkins_target
diff --git a/salt/role/jenkins.sls b/salt/role/jenkins.sls
deleted file mode 100644
index a5b1924..0000000
--- a/salt/role/jenkins.sls
+++ /dev/null
@@ -1,2 +0,0 @@
-include:
-  - profile.web.server.nginx
diff --git a/salt/role/web_jenkins.sls b/salt/role/web_jenkins.sls
new file mode 100644
index 0000000..a5b1924
--- /dev/null
+++ b/salt/role/web_jenkins.sls
@@ -0,0 +1,2 @@
+include:
+  - profile.web.server.nginx
diff --git a/salt/role/worker_jenkins.sls b/salt/role/worker_jenkins.sls
new file mode 100644
index 0000000..bbb8e54
--- /dev/null
+++ b/salt/role/worker_jenkins.sls
@@ -0,0 +1,2 @@
+include:
+  - profile.jenkins