diff --git a/.markerfile b/.markerfile
new file mode 100644
index 0000000..f2b2c15
--- /dev/null
+++ b/.markerfile
@@ -0,0 +1 @@
+#custom marker file, a branch will only be indexed if it has this file
diff --git a/bundle.yaml b/bundle.yaml
index 34c0ca0..802ce37 100644
--- a/bundle.yaml
+++ b/bundle.yaml
@@ -1,5 +1,5 @@
 apiVersion: "1"
-version: "1"
+version: "3"
 id: "cloudbees-ci-workshop-cloudbees-ci-work"
 description: "CloudBees CI configuration bundle for the CloudBees CI Workshop"
 plugins:
diff --git a/jenkins.yaml b/jenkins.yaml
index 102aef2..af9eb67 100644
--- a/jenkins.yaml
+++ b/jenkins.yaml
@@ -1,6 +1,14 @@
+cloudbees-pipeline-policies:
+  config:
+    policies:
+    - action: "fail"
+      name: "Timeout policy"
+      rules:
+      - entirePipelineTimeoutRule:
+          maxTime: 30
 jenkins:
   quietPeriod: 0
-  systemMessage: 'Jenkins configured using CloudBees CI CasC - v1'
+  systemMessage: 'Jenkins configured using CloudBees CI CasC - v3'
 unclassified:
   hibernationConfiguration:
     activities:
@@ -26,6 +34,37 @@ unclassified:
               credentialsId: "cloudbees-ci-workshop-github-app"
               repoOwner: "cloudbees-ci-work"
               repository: "pipeline-library"
+kube:
+  podTemplatesConfiguration:
+    templates:
+    - containers:
+      - args: "cat"
+        command: "/bin/sh -c"
+        image: "maven:3-openjdk-8"
+        livenessProbe:
+          failureThreshold: 0
+          initialDelaySeconds: 0
+          periodSeconds: 0
+          successThreshold: 0
+          timeoutSeconds: 0
+        name: "maven"
+        ttyEnabled: true
+        workingDir: "/home/jenkins/agent"
+      envVars:
+      - envVar:
+          key: "MAVEN_CONFIG"
+          value: "/var/maven/.m2"
+      hostNetwork: false
+      idleMinutes: 30
+      idleMinutesStr: "30"
+      label: "maven"
+      name: "maven"
+      podRetention: "always"
+      volumes:
+      - emptyDirVolume:
+          memory: false
+          mountPath: "/var/maven/"
+      yamlMergeStrategy: "override"
 credentials:
   system:
     domainCredentials:
diff --git a/plugins.yaml b/plugins.yaml
index 8b6ff8b..231f9c5 100644
--- a/plugins.yaml
+++ b/plugins.yaml
@@ -9,6 +9,7 @@ plugins:
 - id: cloudbees-groovy-view
 - id: cloudbees-monitoring
 - id: cloudbees-nodes-plus
+- id: cloudbees-pipeline-policies
 - id: cloudbees-template
 - id: cloudbees-view-creation-filter
 - id: cloudbees-workflow-template