diff --git a/bundle/bundle.yaml b/bundle/bundle.yaml
index ebabbd0..cfbe5ae 100644
--- a/bundle/bundle.yaml
+++ b/bundle/bundle.yaml
@@ -1,10 +1,10 @@
 apiVersion: "1"
-version: "3"
+version: "4"
 id: "cbcauthen-casc-workshop-dev-dev-controller"
 description: "CloudBees CI configuration bundle for the cbcauthen-casc-workshop-dev dev-controller Controller"
 availabilityPattern: "cloudbees-ci-casc-workshop/cbcauthen-casc-workshop-dev/dev-controller"
-parent: "base"
-rbac:
-  - "rbac.yaml"
+parent: "rbac-base"
 items:
   - "folder.yaml"
+variables:
+  - "variables.yaml"
diff --git a/bundle/rbac.yaml b/bundle/rbac.yaml
deleted file mode 100644
index ae27635..0000000
--- a/bundle/rbac.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-removeStrategy:
-  rbac: SYNC
-roles:
-- name: authenticated
-  filterable: 'true'
-  permissions:
-  - hudson.model.Hudson.Read
-  - hudson.model.Item.Read
-  - hudson.model.View.Read
-- name: administrator
-  permissions:
-  - hudson.model.Hudson.Administer
-- name: manager
-  filterable: 'true'
-  permissions:
-  - hudson.model.Hudson.SystemRead
-  - hudson.model.Hudson.Manage
-  - com.cloudbees.plugins.credentials.CredentialsProvider.View
-  - com.cloudbees.pipeline.governance.templates.catalog.TemplateCatalogAction.ViewCatalogs
-  - 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:
-    users:
-    - admin
-    - team-admin
-    - "CBCauthen-admin"
-  roles:
-  - name: administrator
-    grantedAt: current
-- name: controller-managers
-  members:
-    users:
-    - "CBCauthen"
-  roles:
-  - name: manager
-    grantedAt: current
diff --git a/bundle/variables.yaml b/bundle/variables.yaml
new file mode 100644
index 0000000..8adb4eb
--- /dev/null
+++ b/bundle/variables.yaml
@@ -0,0 +1,4 @@
+variables:
+- team: cbcauthen-casc-workshop-dev
+- admin-user: CBCauthen-admin
+- manager-user: CBCauthen