diff --git a/bundle/bundle.yaml b/bundle/bundle.yaml
index 08c22a6..a8efe7a 100644
--- a/bundle/bundle.yaml
+++ b/bundle/bundle.yaml
@@ -1,8 +1,10 @@
 apiVersion: "1"
-version: "2"
+version: "3"
 id: "csk-cloudbees-ci-dev-controller"
 description: "CloudBees CI configuration bundle for the csk-cloudbees-ci dev-controller Controller"
 availabilityPattern: "cloudbees-ci-casc-workshop/csk-cloudbees-ci/dev-controller"
 parent: "base"
 rbac:
   - "rbac.yaml"
+items:
+  - "folder.yaml"
diff --git a/bundle/folder.yaml b/bundle/folder.yaml
new file mode 100644
index 0000000..9c0afb4
--- /dev/null
+++ b/bundle/folder.yaml
@@ -0,0 +1,16 @@
+removeStrategy:
+ items: "none"
+ rbac: "sync"
+items:
+ - kind: "folder"
+   name: "controller-jobs"
+   description: "Base controller folder for all jobs."
+   groups:
+     - name: "job-managers"
+       members:
+         internal_groups:
+         - controller-managers
+       roles:
+         - name: "job-manager"
+           grantedAt: "current"
+           propagates: "true"
diff --git a/bundle/rbac.yaml b/bundle/rbac.yaml
index 9ef763b..c35733c 100644
--- a/bundle/rbac.yaml
+++ b/bundle/rbac.yaml
@@ -20,6 +20,13 @@ roles:
   - com.cloudbees.jenkins.plugin.metrics.views.Alerter.View
   - nectar.plugins.rbac.groups.Group.View
   - nectar.plugins.rbac.roles.Role.View
+- name: job-manager
+  filterable: 'true'
+  permissions:
+  - hudson.model.Item.Read
+  - hudson.model.Item.Create
+  - hudson.model.Item.Configure
+  - hudson.model.Item.Build
 groups:
 - name: controller-admins
   members: