diff --git a/bundle/bundle.yaml b/bundle/bundle.yaml
index 93bd7bd..5e285e3 100644
--- a/bundle/bundle.yaml
+++ b/bundle/bundle.yaml
@@ -1,10 +1,10 @@
 apiVersion: "1"
-version: "2"
+version: "3"
 id: "cloudbeescascmgangwal-ops-controller"
 description: "CloudBees CI configuration bundle for the cloudbeescascmgangwal ops-controller Controller"
 availabilityPattern: "cloudbees-ci-casc-workshop/cloudbeescascmgangwal/ops-controller"
 jcasc:
-  - "jenkins.yaml"
+  - "jcasc/"
 plugins:
   - "plugins.yaml"
 items:
diff --git a/bundle/jcasc/credentials.yaml b/bundle/jcasc/credentials.yaml
new file mode 100644
index 0000000..f8f4dee
--- /dev/null
+++ b/bundle/jcasc/credentials.yaml
@@ -0,0 +1,21 @@
+credentials:
+  system:
+    domainCredentials:
+    - credentials:
+      - string:
+          description: "CasC Update Secret"
+          id: "casc-update-secret"
+          scope: GLOBAL
+          secret: "${cbciCascWorkshopControllerProvisionSecret}"
+      - string:
+          description: "Webhook secret for CloudBees CI Workshop GitHub App"
+          id: "cloudbees-ci-workshop-github-webhook-secret"
+          scope: SYSTEM
+          secret: "${gitHubWebhookSecret}"
+      - gitHubApp:
+          apiUri: "https://api.github.com"
+          appID: "${cbciCascWorkshopGitHubAppId}"
+          description: "CloudBees CI CasC Workshop GitHub App credential"
+          id: "cloudbees-ci-casc-workshop-github-app"
+          owner: "${GITHUB_ORGANIZATION}"
+          privateKey: "${cbciCascWorkshopGitHubAppPrivateKey}"
diff --git a/bundle/jenkins.yaml b/bundle/jcasc/jenkins.yaml
similarity index 55%
rename from bundle/jenkins.yaml
rename to bundle/jcasc/jenkins.yaml
index 2b62a43..a864454 100644
--- a/bundle/jenkins.yaml
+++ b/bundle/jcasc/jenkins.yaml
@@ -11,7 +11,7 @@ jenkins:
       - key: "BUNDLE_ID"
         value: "${CASC_BUNDLE_ID}"
   quietPeriod: 0
-  systemMessage: 'Jenkins configured using CloudBees CI CasC v2'
+  systemMessage: 'Jenkins configured using CloudBees CI CasC v3'
 notificationConfiguration:
   enabled: true
   router: "operationsCenter"
@@ -41,25 +41,4 @@ unclassified:
               repoOwner: "${GITHUB_ORGANIZATION}"
               repository: "pipeline-library"
   headerLabel:
-    text: "${GITHUB_APP}-bundle-v2"
-credentials:
-  system:
-    domainCredentials:
-    - credentials:
-      - string:
-          description: "CasC Update Secret"
-          id: "casc-update-secret"
-          scope: GLOBAL
-          secret: "${cbciCascWorkshopControllerProvisionSecret}"
-      - string:
-          description: "Webhook secret for CloudBees CI Workshop GitHub App"
-          id: "cloudbees-ci-workshop-github-webhook-secret"
-          scope: SYSTEM
-          secret: "${gitHubWebhookSecret}"
-      - gitHubApp:
-          apiUri: "https://api.github.com"
-          appID: "${cbciCascWorkshopGitHubAppId}"
-          description: "CloudBees CI CasC Workshop GitHub App credential"
-          id: "cloudbees-ci-casc-workshop-github-app"
-          owner: "${GITHUB_ORGANIZATION}"
-          privateKey: "${cbciCascWorkshopGitHubAppPrivateKey}"
+    text: "${GITHUB_APP}-bundle-v3"
diff --git a/controller-casc-update b/controller-casc-update
index a8d03e1..190380c 100644
--- a/controller-casc-update
+++ b/controller-casc-update
@@ -21,7 +21,7 @@ pipeline {
             'controller':{'name':'${env.GITHUB_ORG}-${GITHUB_REPO}','action':'casc_bundle_update','bundle_id':'${env.BUNDLE_ID}'},
             'github':{'organization':'${env.GITHUB_ORG}','repository':'${GITHUB_REPO}'},
             'secret':'${CASC_UPDATE_SECRET}',
-            'casc':{'auto_reload':'false'}
+            'casc':{'auto_reload':'true'}
           }
         """), verbose: true
       }