diff --git a/Dockerfile b/Dockerfile
index 0a524b8b7bebadb7399a2d0cd4671dbb8bdb6e6e..6bf06e30443449ddb908064fad1c62cfd4588437 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,8 +42,8 @@ HEALTHCHECK --interval=5m --timeout=3s \
   CMD curl -fsL ${JENKINS_URL}/login || exit 1
 
 LABEL securitytxt="https://www.cloudbees.com/.well-known/security.txt"
-LABEL release=4c482ecc2d194d4868ade0a8cb5f773a3ab1c0d5
-LABEL version=2.249.2.3
+LABEL release=35bd8640427b6d61f14c96f9f6e8aecbe4f3822e
+LABEL version=2.249.3.1
 
 ARG TARBALL=files.tar
 COPY ${TARBALL} /tmp
diff --git a/Jenkinsfile b/Jenkinsfile
index 6cbfdbdd8044f2215c4a432829af8c830dcd7f88..e1f19272bd1d36c76b4734a914e4f49d41ac1f67 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @Library('DCCSCR@master') _
-dccscrPipeline(version: '2.249.2.3')
+dccscrPipeline(version: '2.249.3.1')
diff --git a/README.md b/README.md
index b2f5ad6b1b78f355900269d9880daddad3ab437e..606cf42fb41e740ed327ed09ad6700efff911d57 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ CloudBees CI (formerly known as _CloudBees Core_) consists of three Docker image
 For each image, all files other than UBI and native packages
 are included in a `files.tar` marked with a SHA-256 checksum.
 
-A version of CloudBees CI is given in the format `2.249.2.3`
+A version of CloudBees CI is given in the format `2.249.3.1`
 where the first three components are aligned with a Jenkins LTS.
 The Helm chart is coversioned with `core-oc`.
 The `core-mm` image typically shares the same version,
@@ -22,13 +22,13 @@ plus whatever other customizations are desired:
 ```yaml
 OperationsCenter:
   Image:
-    dockerImage: your-registry/core-oc:2.249.2.3
+    dockerImage: your-registry/core-oc:2.249.3.1
 Master:
   Image:
-    dockerImage: your-registry/core-mm:2.249.2.3
+    dockerImage: your-registry/core-mm:2.249.3.1
 Agents:
   Image:
-    dockerImage: your-registry/agent:2.249.2.3
+    dockerImage: your-registry/agent:2.249.3.1
 ```
 
 and [install via Helm 3](https://docs.cloudbees.com/docs/cloudbees-core/latest/kubernetes-install-guide/installing-kubernetes-using-helm) using the local copy of the chart:
diff --git a/download.json b/download.json
index 667cfd3e48ad6deb35ef2d74dcb8702b44fcb6f3..9862a6637f42fe9b95f988106c483ea78550c2a5 100644
--- a/download.json
+++ b/download.json
@@ -1,11 +1,11 @@
 {
   "resources": [
     {
-      "url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-de64bf3a7e6d55e0c13bcf7ddbc72ef820c76548e6d18b4c1d990215e4773698.tar",
+      "url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-185ba37cfbe5145a632eb4b91e6ba257cfa3172a30452a9ff6c96205e9cab451.tar",
       "filename": "files.tar",
       "validation": {
         "type": "sha256",
-        "value": "de64bf3a7e6d55e0c13bcf7ddbc72ef820c76548e6d18b4c1d990215e4773698"
+        "value": "185ba37cfbe5145a632eb4b91e6ba257cfa3172a30452a9ff6c96205e9cab451"
       }
     }
   ]
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 7175dcbeb3caa7ce0f1b6e5483dcf4640ba919e5..a58565d713b95b08aa3a31f6fb005aee8011f43a 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: 2.249.2.3
-description: The Continuous Delivery Solution for Enterprises
+appVersion: 2.249.3.1
+description: Enterprise Continuous Integration with Jenkins
 engine: gotpl
 home: https://www.cloudbees.com/products/continuous-integration
 icon: https://images.ctfassets.net/vtn4rfaw6n2j/7xprMMXARXDBuVxW4y8XfV/349fff91035050e3f2a8ff37bc0615b5/cloudbees-core-logo_header.svg
@@ -8,4 +8,4 @@ keywords:
 - cloudbees
 - jenkins
 name: cloudbees-core
-version: 3.22.0-DEVELOPMENT
+version: 3.23.0-DEVELOPMENT
diff --git a/helm/README.md b/helm/README.md
index 3c7a9e13638816c56bf696d7ae87a9cd63ee68b0..0da9b46928f16c53d56872d74e72c127cfe325b0 100644
--- a/helm/README.md
+++ b/helm/README.md
@@ -1,8 +1,8 @@
 # cloudbees-core
 
-![Version: 3.22.0](https://img.shields.io/badge/Version-3.22.0-informational?style=flat-square) ![AppVersion: 2.249.2.3](https://img.shields.io/badge/AppVersion-2.249.2.3-informational?style=flat-square)
+![Version: 3.23.0](https://img.shields.io/badge/Version-3.23.0-informational?style=flat-square) ![AppVersion: 2.249.3.1](https://img.shields.io/badge/AppVersion-2.249.3.1-informational?style=flat-square)
 
-[CloudBees Core](https://www.cloudbees.com/products/cloudbees-core) is the continuous delivery platform architected for the enterprise. It provides:
+[CloudBees CI](https://www.cloudbees.com/products/continuous-integration) is the continuous integration platform architected for the enterprise. It provides:
 
 * DevOps at scale
 * Resilience and high availability
@@ -18,17 +18,17 @@ $ helm install cloudbees/cloudbees-core --name <release name>
 
 ## Introduction
 
-This chart bootstraps a CloudBees Core deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+This chart bootstraps a CloudBees CI deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
 
 ## Prerequisites
-  - Kubernetes 1.10 or higher
-  - Helm 2.12 or higher
+  - Kubernetes 1.14 or higher
+  - Helm 3.0.2 or higher
 
 ## Requirements
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://charts.cloudbees.com/public/cloudbees | cloudbees-sidecar-injector | 2.0.7 |
+| https://charts.cloudbees.com/public/cloudbees | cloudbees-sidecar-injector | 2.1.0 |
 | https://kubernetes-charts.storage.googleapis.com/ | nginx-ingress | 1.40.2 |
 | https://kubernetes.github.io/ingress-nginx | ingress-nginx | 2.15.0 |
 
@@ -44,18 +44,18 @@ $ helm install cloudbees/cloudbees-core \
        --set OperationsCenter.HostName='cloudbees-core.example.com'
 ```
 
-The command deploys CloudBees Core on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+The command deploys CloudBees CI on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
 
 ### Ingress Controller Installation
 
-The chart is designed, so it can install an nginx-ingress controller.
-The `nginx.ingress.Enabled` field controls ingress controller installation and setup.
+The chart is designed, so it can install an ingress-nginx controller.
+The `"ingress-nginx".Enabled` field controls ingress controller installation and setup.
 To install the chart with the release name `cloudbees-core` and hostname cloudbees-core.example.com.
 
 ```console
 $ helm install cloudbees/cloudbees-core \
        --name cloudbees-core \
-       --set nginx.ingress.Enabled=true
+       --set "ingress-nginx".Enabled=true
 ```
 
 ## Uninstalling the Chart
@@ -65,10 +65,10 @@ To uninstall/delete the `cloudbees-core` deployment:
 ```console
 $ helm delete cloudbees-core
 ```
-> **NOTE**: The current version of the CloudBees Core Helm Chart only manages the Operation Center.
+> **NOTE**: The current version of the CloudBees CI Helm Chart only manages the Operation Center.
 Users should manage Managed Master using Operation Center.
 
-The `helm delete` command stops the CloudBees Core deployment than removes the OperationsCenter Center.
+The `helm delete` command stops the CloudBees CI deployment than removes the OperationsCenter Center.
 The release is still stored in the Helm database, but it will now have the status deleted.
 If you wish to completely remove the release, use the following variation of the `helm delete` command.
 
@@ -76,8 +76,8 @@ If you wish to completely remove the release, use the following variation of the
 $ helm delete cloudbees-core --purge
 ```
 
-> **IMPORTANT**: The `helm delete` command does NOT remove the persistent volume claims as precaution against data losss.
-You will need to use the `kubectl delete pvc` command to delete the persistent volumn claims.
+> **IMPORTANT**: The `helm delete` command does NOT remove the persistent volume claims as precaution against data loss.
+You will need to use the `kubectl delete pvc` command to delete the persistent volume claims.
 
 The command removes all the Kubernetes components associated with the chart and deletes the release.
 
@@ -101,14 +101,14 @@ To use an environment property value file with Helm, use the -f option as shown
 You can download the latest version of the `example-values.yaml` file from CloudBees Examples GitHub repository at https://github.com/cloudbees/cloudbees-examples/tree/master/helm-custom-value-file-examples.
 
 ## Additional Documentation
-CloudBees provides complete and more detail installation and operation documentation on the CloudBees web site at https://go.cloudbees.com/docs/cloudbees-core/cloud-install-guide/kubernetes-helm-install/
+CloudBees provides complete and more detailed installation and operation documentation on the CloudBees web site at https://docs.cloudbees.com/docs/cloudbees-ci/latest/kubernetes-install-guide/
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | Agents.Enabled | bool | `true` | Enable to create agent resources (service account, role) |
-| Agents.Image.dockerImage | string | `"063356183961.dkr.ecr.us-east-1.amazonaws.com/ubi/unified-distribution/agent:2.249.2.3"` | Used to override the default docker image used for agents |
+| Agents.Image.dockerImage | string | `"063356183961.dkr.ecr.us-east-1.amazonaws.com/ubi/unified-distribution/agent:2.249.3.1"` | Used to override the default docker image used for agents |
 | Agents.SeparateNamespace.Create | bool | `false` | If true, the second namespace will be created when installing this chart. Otherwise, the existing namespace should be labeled with `cloudbees.com/role: agents` in order for network policies to work. |
 | Agents.SeparateNamespace.Enabled | bool | `false` | If enabled, agents resources will be created in a separate namespace as well as bindings allowing masters to schedule them. |
 | Agents.SeparateNamespace.Name | string | `nil` | Namespace where to create agents resources. Defaults to `${namespace}-builds` where `${namespace}` is the namespace where the chart is installed. |
@@ -116,7 +116,7 @@ CloudBees provides complete and more detail installation and operation documenta
 | Hibernation.Image.dockerImage | string | `"cloudbees/managed-master-hibernation-monitor:230.ee066a318539"` | Used to override the default docker image |
 | Hibernation.Image.dockerPullPolicy | string | `"IfNotPresent"` | Used to override the default pull policy |
 | Master.Enabled | bool | `true` | Whether to create the resources required to schedule masters. |
-| Master.Image.dockerImage | string | `"063356183961.dkr.ecr.us-east-1.amazonaws.com/ubi/unified-distribution/core-mm:2.249.2.3"` | Used to override the default docker image |
+| Master.Image.dockerImage | string | `"063356183961.dkr.ecr.us-east-1.amazonaws.com/ubi/unified-distribution/core-mm:2.249.3.1"` | Used to override the default docker image |
 | Master.JavaOpts | string | `nil` | Additional Java options to pass to managed masters. For example, setting up a JMX port |
 | Master.OperationsCenterNamespace | string | `nil` | When deploying Master resources, this grants an Operations Center deployed in another namespace the right to deploy masters |
 | NetworkPolicy.Enabled | bool | `false` | Enable only if the cluster supports it. Read the [documentation](https://kubernetes.io/docs/concepts/services-networking/network-policies/) to understand what this is about. |
@@ -131,7 +131,7 @@ CloudBees provides complete and more detail installation and operation documenta
 | OperationsCenter.HealthProbeLivenessFailureThreshold | int | `12` | Threshold for liveness failure |
 | OperationsCenter.HealthProbes | bool | `true` | Enable Kubernetes Liveness and Readiness Probes |
 | OperationsCenter.HostName | string | `nil` | The hostname used to access Operations Center through the ingress controller. |
-| OperationsCenter.Image.dockerImage | string | `"063356183961.dkr.ecr.us-east-1.amazonaws.com/ubi/unified-distribution/core-oc:2.249.2.3"` | Container image to use for Operations Center |
+| OperationsCenter.Image.dockerImage | string | `"063356183961.dkr.ecr.us-east-1.amazonaws.com/ubi/unified-distribution/core-oc:2.249.3.1"` | Container image to use for Operations Center |
 | OperationsCenter.Image.dockerPullPolicy | string | `"Always"` | https://kubernetes.io/docs/concepts/containers/images/#updating-images |
 | OperationsCenter.ImagePullSecrets | string | `nil` | The name of the image pull secret to pull private docker images |
 | OperationsCenter.Ingress.Annotations | object | `{"kubernetes.io/tls-acme":"false"}` | annotations to put on Ingress object |
@@ -159,8 +159,6 @@ CloudBees provides complete and more detail installation and operation documenta
 | Persistence.Annotations | object | `{}` | Annotations to put on the PVC |
 | Persistence.Size | string | `"20Gi"` | Size of the Operations Center volume |
 | Persistence.StorageClass | string | `nil` | Persistent Volume Storage Class for Jenkins Home If defined, storageClassName: <storageClass>. If set to "-", storageClassName: "", which disables dynamic provisioning. If undefined (the default) or set to null, the default storage class will be used, unless specified otherwise below. If setting OperationsCenter.Platform == gke, a storage class backed with SSD drives will be created by this chart and used automatically. |
-| Persistence.mounts | list | `[]` | Additional volume mounts to attach to Operations Center container |
-| Persistence.volumes | list | `[]` | Additional volumes to attach to Operations Center pod |
 | PodSecurityPolicy.Annotations | object | `{}` | Additional annotations to put on the PodSecurityPolicy, e.g. AppArmor/Seccomp settings |
 | PodSecurityPolicy.Enabled | bool | `false` | Enables [Pod Security Policies](https://kubernetes.io/docs/concepts/policy/pod-security-policy/) support Enable only if the cluster supports it. |
 | ingress-nginx.Enabled | bool | `false` | Installs the [ingress-nginx](https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx) controller (optional). Enable this section if you don't have an existing installation of ingress-nginx controller Note: use `beta.kubernetes.io/os` when deploying on Kubernetes versions below 1.16 |
diff --git a/helm/README.md.gotmpl b/helm/README.md.gotmpl
index 3f3b13a1f5f868461359ced4c9450f0a6dea83b9..58718f7fcb55ef8e1e8c215c98b4d31013d598fc 100644
--- a/helm/README.md.gotmpl
+++ b/helm/README.md.gotmpl
@@ -2,7 +2,7 @@
 
 {{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
 
-[CloudBees Core](https://www.cloudbees.com/products/cloudbees-core) is the continuous delivery platform architected for the enterprise. It provides:
+[CloudBees CI](https://www.cloudbees.com/products/continuous-integration) is the continuous integration platform architected for the enterprise. It provides:
 
 * DevOps at scale
 * Resilience and high availability
@@ -18,11 +18,11 @@ $ helm install cloudbees/cloudbees-core --name <release name>
 
 ## Introduction
 
-This chart bootstraps a CloudBees Core deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+This chart bootstraps a CloudBees CI deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
 
 ## Prerequisites
-  - Kubernetes 1.10 or higher
-  - Helm 2.12 or higher
+  - Kubernetes 1.14 or higher
+  - Helm 3.0.2 or higher
 
 {{ template "chart.requirementsSection" . }}
 
@@ -38,18 +38,18 @@ $ helm install cloudbees/cloudbees-core \
        --set OperationsCenter.HostName='cloudbees-core.example.com'
 ```
 
-The command deploys CloudBees Core on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+The command deploys CloudBees CI on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
 
 ### Ingress Controller Installation
 
-The chart is designed, so it can install an nginx-ingress controller.
-The `nginx.ingress.Enabled` field controls ingress controller installation and setup.
+The chart is designed, so it can install an ingress-nginx controller.
+The `"ingress-nginx".Enabled` field controls ingress controller installation and setup.
 To install the chart with the release name `cloudbees-core` and hostname cloudbees-core.example.com.
 
 ```console
 $ helm install cloudbees/cloudbees-core \
        --name cloudbees-core \
-       --set nginx.ingress.Enabled=true
+       --set "ingress-nginx".Enabled=true
 ```
 
 ## Uninstalling the Chart
@@ -59,10 +59,10 @@ To uninstall/delete the `cloudbees-core` deployment:
 ```console
 $ helm delete cloudbees-core
 ```
-> **NOTE**: The current version of the CloudBees Core Helm Chart only manages the Operation Center.
+> **NOTE**: The current version of the CloudBees CI Helm Chart only manages the Operation Center.
 Users should manage Managed Master using Operation Center.
 
-The `helm delete` command stops the CloudBees Core deployment than removes the OperationsCenter Center.
+The `helm delete` command stops the CloudBees CI deployment than removes the OperationsCenter Center.
 The release is still stored in the Helm database, but it will now have the status deleted.
 If you wish to completely remove the release, use the following variation of the `helm delete` command.
 
@@ -70,8 +70,8 @@ If you wish to completely remove the release, use the following variation of the
 $ helm delete cloudbees-core --purge
 ```
 
-> **IMPORTANT**: The `helm delete` command does NOT remove the persistent volume claims as precaution against data losss.
-You will need to use the `kubectl delete pvc` command to delete the persistent volumn claims.
+> **IMPORTANT**: The `helm delete` command does NOT remove the persistent volume claims as precaution against data loss.
+You will need to use the `kubectl delete pvc` command to delete the persistent volume claims.
 
 
 The command removes all the Kubernetes components associated with the chart and deletes the release.
@@ -96,6 +96,6 @@ To use an environment property value file with Helm, use the -f option as shown
 You can download the latest version of the `example-values.yaml` file from CloudBees Examples GitHub repository at https://github.com/cloudbees/cloudbees-examples/tree/master/helm-custom-value-file-examples.
 
 ## Additional Documentation
-CloudBees provides complete and more detail installation and operation documentation on the CloudBees web site at https://go.cloudbees.com/docs/cloudbees-core/cloud-install-guide/kubernetes-helm-install/
+CloudBees provides complete and more detailed installation and operation documentation on the CloudBees web site at https://docs.cloudbees.com/docs/cloudbees-ci/latest/kubernetes-install-guide/
 
 {{ template "chart.valuesSection" . }}
diff --git a/helm/requirements.lock b/helm/requirements.lock
index 8511053a21e654374f92be531fbe227212602d2a..03c0434055aaf28970226b561cf844aa74e0b197 100644
--- a/helm/requirements.lock
+++ b/helm/requirements.lock
@@ -7,6 +7,6 @@ dependencies:
   version: 2.15.0
 - name: cloudbees-sidecar-injector
   repository: https://charts.cloudbees.com/public/cloudbees
-  version: 2.0.7
-digest: sha256:10f7e8c53d0a6f910f4dbe0fd253fbefd288fb5fc24365635968e99b3bc75dbf
-generated: "2020-10-07T14:35:15.239221954Z"
+  version: 2.1.0
+digest: sha256:9e5e49c0f4e06500b06a529b2dcd0ded06bed93a20427287539a1f267f5c45a0
+generated: "2020-11-04T11:46:50.730617819Z"
diff --git a/helm/requirements.yaml b/helm/requirements.yaml
index 1747d0150a5aed9b7cac9bebe8cd526877ee447d..da2b9146c4087bf8b3aaa14fd31cbbf8ee0f1058 100644
--- a/helm/requirements.yaml
+++ b/helm/requirements.yaml
@@ -8,6 +8,6 @@ dependencies:
   repository: https://kubernetes.github.io/ingress-nginx
   condition: ingress-nginx.Enabled
 - name: cloudbees-sidecar-injector
-  version: 2.0.7
+  version: 2.1.0
   repository: https://charts.cloudbees.com/public/cloudbees
   condition: sidecarinjector.Enabled
diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
index 485a0fa5d19eded24e0c90cd2a17c68bc25fe4bc..758b8a7f9274511871f13bb01a0d7afe717a87ff 100644
--- a/helm/templates/_helpers.tpl
+++ b/helm/templates/_helpers.tpl
@@ -133,6 +133,14 @@ Expected Operations Center URL. Always ends with a trailing slash.
 {{- template "oc.protocol" . -}}://{{ include "oc.hostname" . }}{{ include "oc.contextpath" . }}/
 {{- end -}}
 
+{{- define "ingress.apiGroup" -}}
+{{- if ge (atoi (.Capabilities.KubeVersion.Minor)) 15 -}}
+networking.k8s.io
+{{- else -}}
+extensions
+{{- end -}}
+{{- end -}}
+
 {{- define "ingress.apiVersion" -}}
 {{- if ge (atoi (.Capabilities.KubeVersion.Minor)) 15 -}}
 networking.k8s.io/v1beta1
diff --git a/helm/templates/cjoc-role-master-management.yaml b/helm/templates/cjoc-role-master-management.yaml
index 771798e9e3ac4859e4f094e9f3f5ae23b157d5f0..eb4d0564121883073fe9a91b40f4c66a1cbab6ef 100644
--- a/helm/templates/cjoc-role-master-management.yaml
+++ b/helm/templates/cjoc-role-master-management.yaml
@@ -99,7 +99,9 @@ rules:
   - create
 {{- else}}
 - apiGroups:
+  # - {{ include "ingress.apiGroup" . }} TODO once we get https://github.com/cloudbees/cloud-platform-master-provisioning-plugin/pull/325 in.
   - extensions
+  - networking.k8s.io
   resources:
   - ingresses
   verbs:
diff --git a/helm/templates/cjoc-statefulset.yaml b/helm/templates/cjoc-statefulset.yaml
index 9e7f843b83ccff054ed1a9b084f7b0a9444bbdc1..84a495cf22d5e0557bc37950e8c36f1afd72bea5 100644
--- a/helm/templates/cjoc-statefulset.yaml
+++ b/helm/templates/cjoc-statefulset.yaml
@@ -148,7 +148,7 @@ spec:
             {{- if .Values.OperationsCenter.JavaOpts }}
             {{ .Values.OperationsCenter.JavaOpts }}
             {{- end }}
-            {{- if .Values.OperationsCenter.CSRF.ProxyCompatibility -}}
+            {{- if .Values.OperationsCenter.CSRF.ProxyCompatibility }}
             -Djenkins.model.Jenkins.crumbIssuerProxyCompatibility=true
             {{- end }}
             -XX:+UseG1GC
@@ -170,15 +170,14 @@ spec:
             cpu: "{{ .Values.OperationsCenter.Resources.Requests.Cpu }}"
             memory: "{{ .Values.OperationsCenter.Resources.Requests.Memory }}"
         volumeMounts:
-{{- if .Values.Persistence.mounts }}
-{{ toYaml .Values.Persistence.mounts | indent 12 }}
-{{- end }}
         - name: jenkins-home
           mountPath: /var/jenkins_home
           readOnly: false
         - name: jenkins-configure-jenkins-groovy
           mountPath: /var/jenkins_config/configure-jenkins.groovy.d
           readOnly: true
+        - name: tmp
+          mountPath: /tmp
 {{- if .Values.OperationsCenter.ExtraVolumeMounts }}
 {{toYaml .Values.OperationsCenter.ExtraVolumeMounts | indent 8}}
 {{- end }}
@@ -202,12 +201,11 @@ spec:
 {{toYaml .Values.OperationsCenter.ExtraContainers | indent 6}}
 {{- end }}
       volumes:
-{{- if .Values.Persistence.volumes }}
-{{ toYaml .Values.Persistence.volumes | indent 6 }}
-{{- end }}
       - name: jenkins-configure-jenkins-groovy
         configMap:
           name: cjoc-configure-jenkins-groovy
+      - name: tmp
+        emptyDir: {}
 {{- if .Values.OperationsCenter.ExtraVolumes }}
 {{toYaml .Values.OperationsCenter.ExtraVolumes | indent 6}}
 {{- end }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 9711d1cb30fc1f274ebd2574ad82be9c485a22df..a928def0472df26d3944f312518af23e930a6985 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -50,7 +50,7 @@ OperationsCenter:
   # Operations Center docker image
   Image:
     # OperationsCenter.Image.dockerImage -- Container image to use for Operations Center
-    dockerImage: dcar/core-oc:2.249.2.3
+    dockerImage: dcar/core-oc:2.249.3.1
     # OperationsCenter.Image.dockerPullPolicy -- https://kubernetes.io/docs/concepts/containers/images/#updating-images
     dockerPullPolicy: IfNotPresent
 
@@ -241,7 +241,7 @@ Master:
   # Docker image inserted in Operations Center automatically
   Image:
     # Master.Image.dockerImage -- Used to override the default docker image
-    dockerImage: dcar/core-mm:2.249.2.3
+    dockerImage: dcar/core-mm:2.249.3.1
   # Master.JavaOpts -- Additional Java options to pass to managed masters. For example, setting up a JMX port
   JavaOpts: null
 
@@ -258,7 +258,7 @@ Agents:
     Create: false
   Image:
     # Agents.Image.dockerImage -- Used to override the default docker image used for agents
-    dockerImage: dcar/agent:2.249.2.3
+    dockerImage: dcar/agent:2.249.3.1
 
 Persistence:
   # Persistence.StorageClass -- Persistent Volume Storage Class for Jenkins Home
@@ -283,16 +283,6 @@ Persistence:
   # Persistence.Size -- Size of the Operations Center volume
   Size: 20Gi
 
-  # Persistence.volumes -- Additional volumes to attach to Operations Center pod
-  volumes: []
-#  - name: nothing
-#    emptyDir: {}
-  # Persistence.mounts -- Additional volume mounts to attach to Operations Center container
-  mounts: []
-#  - mountPath: /var/nothing
-#    name: nothing
-#    readOnly: true
-
 # Master hibernation
 Hibernation:
   # Hibernation.Enabled -- Whether to enable the [Hibernation](https://docs.cloudbees.com/docs/cloudbees-ci/latest/cloud-admin-guide/managing-masters#_hibernation_of_managed_masters) feature
diff --git a/scripts/usr/local/bin/jenkins.sh b/scripts/usr/local/bin/jenkins.sh
index f67b156dba8ee6c6bc934eba2580902a9723a218..f8d26aeb061930cf0952e743fc01948b984cbf71 100644
--- a/scripts/usr/local/bin/jenkins.sh
+++ b/scripts/usr/local/bin/jenkins.sh
@@ -52,7 +52,7 @@ find /usr/share/jenkins/ref/ -type f -exec bash -c "copy_reference_file '{}'" \;
 
 # if `docker run` first argument start with `--` the user is passing jenkins launcher arguments
 if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
-  eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=4c482ecc2d194d4868ade0a8cb5f773a3ab1c0d5 /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\""
+  eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=35bd8640427b6d61f14c96f9f6e8aecbe4f3822e /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\""
 fi
 
 # As argument is not jenkins, assume user want to run his own process, for sample a `bash` shell to explore this image