diff --git a/.github/release-notes.yml b/.github/release.yml
similarity index 51%
rename from .github/release-notes.yml
rename to .github/release.yml
index 3bae10e4..86926f4d 100644
--- a/.github/release-notes.yml
+++ b/.github/release.yml
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Crown Copyright
+# Copyright 2020-2024 Crown Copyright
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,23 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-releasenotes:
-  sections:
-  - title: "Headliners"
-    emoji: ":star:"
-    labels: [ "headliner" ]
-  - title: "New Features"
-    emoji: ":gift:"
-    labels: [ "feature" ]
-  - title: "Enhancements"
-    emoji: ":sparkles:"
-    labels: [ "enhancement" ]
-  - title: "Bugs Fixed"
-    emoji: ":beetle:"
-    labels: [ "bug" ]
-  - title: "Documentation"
-    emoji: ":book:"
-    labels: "documentation"
-  - title: "Automation"
-    emoji: ":robot:"
-    labels: [ "automation" ]
+changelog:
+  categories:
+  - title: Headliners
+    labels:
+      - headliner
+  - title: New Features
+    labels:
+      - feature
+  - title: Enhancements
+    labels:
+      - enhancement
+  - title: Bugs Fixed
+    labels:
+      - bug
+  - title: Documentation
+    labels:
+      - documentation
+  - title: Automation
+    labels:
+      - automation
diff --git a/.github/workflows/create-release-branch.yaml b/.github/workflows/create-release-branch.yaml
index 7782110b..a2658581 100644
--- a/.github/workflows/create-release-branch.yaml
+++ b/.github/workflows/create-release-branch.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Crown Copyright
+# Copyright 2021-2024 Crown Copyright
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,11 +15,9 @@
 name: Create Release Branch
 
 on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Release Branch Version'
-        required: false
+  milestone:
+    types:
+    - closed
 
 jobs:
   create-release-branch:
@@ -33,25 +31,9 @@ jobs:
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
         fetch-depth: 0
 
-    - name: Set version from input
-      if: ${{ github.event.inputs.version }}
-      run: echo "RELEASE_VERSION=$(echo ${{ github.event.inputs.version }} | sed 's/^v//')" >> $GITHUB_ENV
-
-    - name: Get latest tag
-      if: ${{ !github.event.inputs.version }}
-      uses: actions-ecosystem/action-get-latest-tag@v1
-      id: get-latest-tag
-
-    - name: Format latest tag
-      if: ${{ !github.event.inputs.version }}
-      run: echo "CURRENT_VERSION=$(echo ${{ steps.get-latest-tag.outputs.tag }} | sed 's/^v//')" >> $GITHUB_ENV
-
-    - name: Bump latest tag variable version
-      if: ${{ !github.event.inputs.version }}
-      run: echo "RELEASE_VERSION=$(echo ${{ env.CURRENT_VERSION }} | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)/echo \1.$((\2+1)).0/' | sh)" >> $GITHUB_ENV
-
-    - name: Verify version regex
-      run: echo ${{ env.RELEASE_VERSION }} | grep -E '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'
+    - name: Set version from milestone
+      if: ${{ github.event.milestone.title }}
+      run: echo "RELEASE_VERSION=$(echo ${{ github.event.milestone.title }} | sed 's/^v//')" >> $GITHUB_ENV
 
     - name: Set release branch
       run: echo "BRANCH_NAME=$(echo release/${{ env.RELEASE_VERSION }} )" >> $GITHUB_ENV
@@ -62,10 +44,23 @@ jobs:
         git config user.email 41898282+github-actions[bot]@users.noreply.github.com
 
     - name: Update versions
-      run: ./cd/update_versions.sh ${RELEASE_VERSION}
+      run: |
+        ./cd/update_versions.sh ${RELEASE_VERSION}
 
     - name: Push to release branch
       run: |
         git checkout -b $BRANCH_NAME
         git commit -a -m "prepare release v${RELEASE_VERSION}" --allow-empty
         git push --set-upstream origin $BRANCH_NAME
+
+    - name: Tag release branch
+      run: |
+        git tag v${RELEASE_VERSION}
+        git push origin v${RELEASE_VERSION}
+        git push
+
+    - name: Create PR to master
+      run: |
+        gh pr create -B master -H $BRANCH_NAME --title 'Updated Gaffer version to ${{ github.event.milestone.title }}' --body 'Created by GH Action'
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 0579c4b4..53affca9 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -12,20 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Release
+name: Full Release
 
 on:
-  milestone:
-    types:
-    - closed
-  workflow_dispatch:
+  pull_request:
+    branches:
+        - master
+    types: [closed]
 
 jobs:
-  create-release-tag:
+  get-release-version:
     runs-on: ubuntu-latest
-    if: github.event_name == 'milestone'
+    if: ${{ github.event.pull_request.merged }}
     outputs:
-      branch_name: ${{ steps.branch.outputs.branch_name }}
+      release_version: ${{ steps.release-version.outputs.release_version }}
 
     steps:
     - name: Checkout master
@@ -34,48 +34,32 @@ jobs:
         ref: master
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
         fetch-depth: 0
-    
+
     - name: Set up Github credentials
       run: |
         git config user.name github-actions[bot]
         git config user.email 41898282+github-actions[bot]@users.noreply.github.com
-    
-    - name: Set release version
-      run: echo "RELEASE_VERSION=$(echo ${{ github.event.milestone.title }} | cut -c 2-)" >> $GITHUB_ENV
-
-    - name: Set branch name
-      run: echo "BRANCH_NAME=$(git branch -a | grep $RELEASE_VERSION | tail -n 1 | cut -c 18-)" >> $GITHUB_ENV
 
-    - name: Output branch name
-      id: branch
-      run: echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
+    - name: Get latest tag
+      uses: actions-ecosystem/action-get-latest-tag@v1
+      id: get-latest-tag
 
-    - name: Fail if no branch found
-      if: ${{ !env.BRANCH_NAME }}
-      run: exit 1
+    - name: Format latest tag
+      run: echo "CURRENT_VERSION=$(echo ${{ steps.get-latest-tag.outputs.tag }} | sed 's/^v//')" >> $GITHUB_ENV
 
-    - name: Merge release into master
-      run: |
-        git checkout ${{ env.BRANCH_NAME }}
-        git checkout master
-        git merge ${{ env.BRANCH_NAME }}
-
-    - name: Push changes
-      run: |
-        git tag v${RELEASE_VERSION}
-        git push origin v${RELEASE_VERSION}
-        git push
+    - name: Set release version
+      id: release-version
+      run: echo "release_version=$(echo $CURRENT_VERSION)" >> $GITHUB_OUTPUT
 
   update-branches:
     runs-on: ubuntu-latest
-    if: github.event_name == 'milestone'
     strategy:
       matrix:
         branch:
         - develop
         - gh-pages
     needs:
-    - create-release-tag
+    - get-release-version
 
     steps:
     - uses: actions/checkout@v4
@@ -83,17 +67,15 @@ jobs:
         ref: ${{ matrix.branch }}
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
         fetch-depth: 0
-    
+
     - name: Set up Github credentials
       run: |
         git config user.name github-actions[bot]
         git config user.email 41898282+github-actions[bot]@users.noreply.github.com
-  
-    - name: Merge release into branch
+
+    - name: Merge master into branches
       run: |
-        git checkout ${{ needs.create-release-tag.outputs.branch_name }}
-        git checkout ${{ matrix.branch }}
-        git merge ${{ needs.create-release-tag.outputs.branch_name }} --strategy-option theirs
+        git merge origin/master
         git push
 
   publish-images-to-dockerhub:
@@ -103,7 +85,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         ref: develop
-        
+
     - name: Build images with Accumulo 2 dependency
       run: ./cd/build_images.sh ./docker/accumulo2.env
 
@@ -118,46 +100,31 @@ jobs:
         GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
       run: ./cd/publish_images.sh
 
-  create-release-notes:
+  update-github-releases:
     runs-on: ubuntu-latest
-    if: github.event_name == 'milestone'
     needs:
-    - create-release-tag
-    - update-branches
-
-    outputs:
-      release_upload_url: ${{ steps.upload_notes.outputs.upload_url }}
+    - get-release-version
 
     steps:
     - uses: actions/checkout@v4
       with:
-        ref: develop
-    
-    - name: Create Release Notes
-      id: create_release_notes
-      uses: docker://decathlon/release-notes-generator-action:3.1.6
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        ref: master
 
     - name: Set version
-      run: echo "RELEASE_VERSION=$(echo ${{ github.event.milestone.title }} | cut -c 2-)" >> $GITHUB_ENV
+      run: echo "RELEASE_VERSION=$(echo ${{ needs.get-release-version.outputs.release_version }})" >> $GITHUB_ENV
 
-    - name: Upload notes
-      id: upload_notes
+    - name: Create github release
       uses: softprops/action-gh-release@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         tag_name: v${{ env.RELEASE_VERSION }}
         name: Gaffer Docker ${{ env.RELEASE_VERSION }}
-        body_path: release_file.md
 
   upload-release-artifacts:
     runs-on: ubuntu-latest
-    if: github.event_name == 'milestone'
     needs:
-    - create-release-tag
-    - create-release-notes
+    - get-release-version
     strategy:
       matrix:
         chart:
@@ -171,10 +138,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         ref: develop
-    
+
     - name: Install dependencies
       run: ./cd/install_dependencies.sh
-    
+
     - name: Create Asset
       env:
         chart: ${{ matrix.chart }}
@@ -182,22 +149,21 @@ jobs:
         helm package "kubernetes/${chart}"
         filename=$(ls | grep ${chart}-[0-9]*.[0-9]*.[0-9]*.tgz)
         echo "ASSET_FILENAME=${filename}" >> $GITHUB_ENV
-    
+
     - name: Upload chart artifact
       uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.chart }}
         path: ${{ env.ASSET_FILENAME }}
         retention-days: 1
-    
+
     - name: Upload Asset
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: gh release upload ${{ github.event.milestone.title }} ${{ env.ASSET_FILENAME }}
+      run: gh release upload ${{ steps.release-version.outputs.release_version }} ${{ env.ASSET_FILENAME }}
 
   update-helm-repo:
     runs-on: ubuntu-latest
-    if: github.event_name == 'milestone'
     needs:
     - upload-release-artifacts
 
@@ -207,7 +173,7 @@ jobs:
       with:
         ref: gh-pages
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
-    
+
     - name: Set up Github credentials
       run: |
         git config user.name github-actions[bot]
@@ -221,7 +187,7 @@ jobs:
     - name: Update repo
       run: |
         mv artifacts/*/*.tgz .
-        helm repo index . --url "https://github.com/gchq/gaffer-docker/releases/download/${{ github.event.milestone.title }}" --merge index.yaml
+        helm repo index . --url "https://github.com/gchq/gaffer-docker/releases/download/${{ steps.release-version.outputs.release_version }}" --merge index.yaml
         sed -i'' -e 's|file://.*|https://gchq.github.io/gaffer-docker|g' index.yaml
         rm *.tgz
         rm -r artifacts
diff --git a/cd/update_versions.sh b/cd/update_versions.sh
index d96f1c81..dc15efcb 100755
--- a/cd/update_versions.sh
+++ b/cd/update_versions.sh
@@ -27,6 +27,14 @@ source ./docker/accumulo2.env
 # JHUB_OPTIONS_SERVER_VERSION
 source ./docker/gaffer-jhub-options-server/get-version.sh
 
+# Update docker versions
+find . -type f -exec sed -i "s/GAFFER_VERSION=[0-9]\.[0-9]\.[0-9]/GAFFER_VERSION=${APP_VERSION}/g" {} +
+find . -type f -exec sed -E -i "s/GAFFERPY_VERSION=(gafferpy-)?[0-9]\.[0-9]\.[0-9]/GAFFERPY_VERSION=\1${APP_VERSION}/g" {} +
+find . -type f -exec sed -i "s/GAFFER_TESTER_VERSION=[0-9]\.[0-9]\.[0-9]/GAFFER_TESTER_VERSION=${APP_VERSION}/g" {} +
+sed -i'' -e "s/<gaffer.version>[0-9]\.[0-9]\.[0-9]/<gaffer.version>${APP_VERSION}/g" docker/gaffer-gremlin/pom.xml
+sed -i'' -e "s/BASE_IMAGE_TAG=[0-9]\.[0-9]\.[0-9]/BASE_IMAGE_TAG=${APP_VERSION}/g" docker/gaffer-kerberos/gaffer-krb/Dockerfile
+sed -i'' -e "s/BASE_IMAGE_TAG=[0-9]\.[0-9]\.[0-9]/BASE_IMAGE_TAG=${APP_VERSION}/g" docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile
+
 # hdfs
 [ ! -z "${APP_VERSION}" ] && yq eval ".version = \"${APP_VERSION}\"" -i ./kubernetes/hdfs/Chart.yaml
 yq eval ".appVersion = \"${HADOOP_VERSION}\"" -i ./kubernetes/hdfs/Chart.yaml
diff --git a/docker/accumulo1.env b/docker/accumulo1.env
index a4399b94..dacc4542 100644
--- a/docker/accumulo1.env
+++ b/docker/accumulo1.env
@@ -3,9 +3,9 @@ HADOOP_VERSION=3.2.2
 ACCUMULO_VERSION=1.9.3
 HADOOP_CONF_DIR=/etc/hadoop/conf
 ACCUMULO_CONF_DIR=/etc/accumulo/conf
-GAFFER_VERSION=2.2.2
-GAFFER_TESTER_VERSION=2.2.2
-GAFFERPY_VERSION=2.2.2
+GAFFER_VERSION=2.3.0
+GAFFER_TESTER_VERSION=2.3.0
+GAFFERPY_VERSION=2.3.0
 SPARK_VERSION=3.1.2
 TINKERPOP_VERSION=3.7.1
 KUBECTL_VERSION=1.23.0
diff --git a/docker/accumulo2.env b/docker/accumulo2.env
index ed59aa57..bea7dbcc 100644
--- a/docker/accumulo2.env
+++ b/docker/accumulo2.env
@@ -3,9 +3,9 @@ HADOOP_VERSION=3.3.3
 ACCUMULO_VERSION=2.0.1
 HADOOP_CONF_DIR=/etc/hadoop/conf
 ACCUMULO_CONF_DIR=/etc/accumulo/conf
-GAFFER_VERSION=2.2.2
-GAFFER_TESTER_VERSION=2.2.2
-GAFFERPY_VERSION=2.2.2
+GAFFER_VERSION=2.3.0
+GAFFER_TESTER_VERSION=2.3.0
+GAFFERPY_VERSION=2.3.0
 SPARK_VERSION=3.1.2
 TINKERPOP_VERSION=3.7.1
 KUBECTL_VERSION=1.23.0
diff --git a/docker/gaffer-federated-integration-tests/.env b/docker/gaffer-federated-integration-tests/.env
index 0e6a183e..fa527189 100644
--- a/docker/gaffer-federated-integration-tests/.env
+++ b/docker/gaffer-federated-integration-tests/.env
@@ -1,6 +1,6 @@
 ZOOKEEPER_VERSION=3.7.1
-GAFFER_VERSION=2.2.2
-GAFFER_TESTER_VERSION=2.2.2
+GAFFER_VERSION=2.3.0
+GAFFER_TESTER_VERSION=2.3.0
 ACCUMULO_VERSION=2.0.1
 HADOOP_VERSION=3.3.3
 ACCUMULO_CONF_DIR=/etc/accumulo/conf
diff --git a/docker/gaffer-gremlin/pom.xml b/docker/gaffer-gremlin/pom.xml
index b4ccc139..50e3b706 100644
--- a/docker/gaffer-gremlin/pom.xml
+++ b/docker/gaffer-gremlin/pom.xml
@@ -24,7 +24,7 @@
 
     <!-- Properties can be overriden for CI/CD -->
     <properties>
-        <gaffer.version>2.2.2</gaffer.version>
+        <gaffer.version>2.3.0</gaffer.version>
         <jersey.version>2.36</jersey.version>
     </properties>
 
diff --git a/docker/gaffer-integration-tests/.env b/docker/gaffer-integration-tests/.env
index 0e6a183e..fa527189 100644
--- a/docker/gaffer-integration-tests/.env
+++ b/docker/gaffer-integration-tests/.env
@@ -1,6 +1,6 @@
 ZOOKEEPER_VERSION=3.7.1
-GAFFER_VERSION=2.2.2
-GAFFER_TESTER_VERSION=2.2.2
+GAFFER_VERSION=2.3.0
+GAFFER_TESTER_VERSION=2.3.0
 ACCUMULO_VERSION=2.0.1
 HADOOP_VERSION=3.3.3
 ACCUMULO_CONF_DIR=/etc/accumulo/conf
diff --git a/docker/gaffer-kerberos/.env b/docker/gaffer-kerberos/.env
index 2282b799..ade6bf55 100644
--- a/docker/gaffer-kerberos/.env
+++ b/docker/gaffer-kerberos/.env
@@ -1,4 +1,4 @@
-GAFFER_VERSION=2.2.2
+GAFFER_VERSION=2.3.0
 GAFFER_KRB_PASSWORD=change-password-for-gaffer
 
 ZOOKEEPER_VERSION=3.7.1
diff --git a/docker/gaffer-kerberos/gaffer-integration-tests-krb/.env b/docker/gaffer-kerberos/gaffer-integration-tests-krb/.env
index be6b4009..da1dbb4d 100644
--- a/docker/gaffer-kerberos/gaffer-integration-tests-krb/.env
+++ b/docker/gaffer-kerberos/gaffer-integration-tests-krb/.env
@@ -1,6 +1,6 @@
-GAFFER_VERSION=2.2.2
+GAFFER_VERSION=2.3.0
 GAFFER_KRB_PASSWORD=change-password-for-gaffer
-GAFFER_TESTER_VERSION=2.2.2
+GAFFER_TESTER_VERSION=2.3.0
 
 ZOOKEEPER_VERSION=3.7.1
 ZOOKEEPER_KRB_PASSWORD=change-password-for-zookeeper
diff --git a/docker/gaffer-kerberos/gaffer-krb/Dockerfile b/docker/gaffer-kerberos/gaffer-krb/Dockerfile
index f37651da..dd8f8d1b 100644
--- a/docker/gaffer-kerberos/gaffer-krb/Dockerfile
+++ b/docker/gaffer-kerberos/gaffer-krb/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG BASE_IMAGE_NAME=gchq/gaffer
-ARG BASE_IMAGE_TAG=2.2.2
+ARG BASE_IMAGE_TAG=2.3.0
 
 ARG USER=accumulo
 ARG GROUP=accumulo
diff --git a/docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile b/docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile
index 1471ce04..ca9c2d23 100644
--- a/docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile
+++ b/docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG BASE_IMAGE_NAME=gchq/gaffer-rest
-ARG BASE_IMAGE_TAG=2.2.2
+ARG BASE_IMAGE_TAG=2.3.0
 
 FROM ${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}
 
diff --git a/docker/gaffer-pyspark-notebook/.env b/docker/gaffer-pyspark-notebook/.env
index 2675c6a6..5d8a39bb 100644
--- a/docker/gaffer-pyspark-notebook/.env
+++ b/docker/gaffer-pyspark-notebook/.env
@@ -1,6 +1,6 @@
 ZOOKEEPER_VERSION=3.7.1
-GAFFER_VERSION=2.2.2
-GAFFERPY_VERSION=2.2.2
+GAFFER_VERSION=2.3.0
+GAFFERPY_VERSION=2.3.0
 ACCUMULO_VERSION=2.0.1
 HADOOP_VERSION=3.3.3
 SPARK_VERSION=3.1.2
diff --git a/docker/gaffer-pyspark-notebook/Dockerfile b/docker/gaffer-pyspark-notebook/Dockerfile
index 3e5356f2..91665df5 100644
--- a/docker/gaffer-pyspark-notebook/Dockerfile
+++ b/docker/gaffer-pyspark-notebook/Dockerfile
@@ -60,7 +60,7 @@ ARG KUBECTL_VERSION=1.23.0
 RUN curl -fLo /bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
 	chmod +x /bin/kubectl
 
-ARG GAFFERPY_VERSION=gafferpy-2.2.2
+ARG GAFFERPY_VERSION=gafferpy-2.3.0
 RUN git clone -b ${GAFFERPY_VERSION} --depth 1 https://github.com/gchq/gafferpy && \
 	pushd gafferpy && \
 	python setup.py install && \
diff --git a/docker/gaffer-rest/.env b/docker/gaffer-rest/.env
index a7ab3d7b..e5172c2d 100644
--- a/docker/gaffer-rest/.env
+++ b/docker/gaffer-rest/.env
@@ -1,2 +1,2 @@
-GAFFER_VERSION=2.2.2
+GAFFER_VERSION=2.3.0
 ACCUMULO_VERSION=2.0.1
diff --git a/docker/gaffer-rest/Dockerfile b/docker/gaffer-rest/Dockerfile
index 84940407..da6a32a2 100644
--- a/docker/gaffer-rest/Dockerfile
+++ b/docker/gaffer-rest/Dockerfile
@@ -21,7 +21,7 @@ ARG BASE_IMAGE_TAG=8-latest
 FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
 
 ARG ACCUMULO_VERSION=2.0.1
-ARG GAFFER_VERSION=2.2.2
+ARG GAFFER_VERSION=2.3.0
 ARG GAFFER_GIT_REPO=https://github.com/gchq/Gaffer.git
 ARG GAFFER_DOWNLOAD_URL=https://repo1.maven.org/maven2
 
diff --git a/docker/gaffer-road-traffic-loader/.env b/docker/gaffer-road-traffic-loader/.env
index b59ad0ac..e81e12b1 100644
--- a/docker/gaffer-road-traffic-loader/.env
+++ b/docker/gaffer-road-traffic-loader/.env
@@ -1,5 +1,5 @@
 ZOOKEEPER_VERSION=3.7.1
-GAFFER_VERSION=2.2.2
+GAFFER_VERSION=2.3.0
 ACCUMULO_VERSION=2.0.1
 HADOOP_VERSION=3.3.3
 ACCUMULO_CONF_DIR=/etc/accumulo/conf
diff --git a/docker/gaffer-road-traffic-loader/Dockerfile b/docker/gaffer-road-traffic-loader/Dockerfile
index 96bfd67d..68d9cae3 100644
--- a/docker/gaffer-road-traffic-loader/Dockerfile
+++ b/docker/gaffer-road-traffic-loader/Dockerfile
@@ -20,7 +20,7 @@ ARG BASE_IMAGE_TAG=8-jre-headless-latest
 
 FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
 
-ARG GAFFER_VERSION=2.2.2
+ARG GAFFER_VERSION=2.3.0
 ARG GAFFER_GIT_REPO=https://github.com/gchq/Gaffer.git
 ARG GAFFER_DOWNLOAD_URL=https://repo1.maven.org/maven2
 
diff --git a/docker/gaffer/.env b/docker/gaffer/.env
index b59ad0ac..e81e12b1 100644
--- a/docker/gaffer/.env
+++ b/docker/gaffer/.env
@@ -1,5 +1,5 @@
 ZOOKEEPER_VERSION=3.7.1
-GAFFER_VERSION=2.2.2
+GAFFER_VERSION=2.3.0
 ACCUMULO_VERSION=2.0.1
 HADOOP_VERSION=3.3.3
 ACCUMULO_CONF_DIR=/etc/accumulo/conf
diff --git a/docker/gaffer/Dockerfile b/docker/gaffer/Dockerfile
index d5ebf9ef..e29ca453 100644
--- a/docker/gaffer/Dockerfile
+++ b/docker/gaffer/Dockerfile
@@ -21,7 +21,7 @@ ARG BASE_IMAGE_TAG=2.0.1
 FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
 
 ARG BASE_IMAGE_TAG
-ARG GAFFER_VERSION=2.2.2
+ARG GAFFER_VERSION=2.3.0
 ARG GAFFER_LIBS=bitmap-library,sketches-library,time-library
 ARG GAFFER_DOWNLOAD_URL=https://repo1.maven.org/maven2
 ARG GAFFER_GIT_REPO=https://github.com/gchq/Gaffer.git
diff --git a/kubernetes/accumulo/Chart.yaml b/kubernetes/accumulo/Chart.yaml
index 34d2f203..e8d407d6 100644
--- a/kubernetes/accumulo/Chart.yaml
+++ b/kubernetes/accumulo/Chart.yaml
@@ -15,17 +15,17 @@ apiVersion: v2
 name: accumulo
 description: A Key-Value Accumulo store
 type: application
-version: 2.2.2 # managed version
+version: 2.3.0 # managed version
 appVersion: 2.0.1
 home: https://github.com/gchq/Gaffer
 sources:
   - https://github.com/gchq/gaffer-docker
 dependencies:
   - name: zookeeper
-    version: 2.1.5
-    repository: https://charts.helm.sh/incubator/
+    version: 11.4.11
+    repository: https://charts.bitnami.com/bitnami/
     condition: zookeeper.enabled
   - name: hdfs
-    version: ^2.2.2 # managed version
+    version: ^2.3.0 # managed version
     repository: file://../hdfs/
     condition: hdfs.enabled
diff --git a/kubernetes/accumulo/templates/_helpers.tpl b/kubernetes/accumulo/templates/_helpers.tpl
index 6e58656e..64c9c208 100644
--- a/kubernetes/accumulo/templates/_helpers.tpl
+++ b/kubernetes/accumulo/templates/_helpers.tpl
@@ -1,3 +1,20 @@
+{{- /*
+
+Copyright 2020-2024 Crown Copyright
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+*/ -}}
 {{/* vim: set filetype=mustache: */}}
 {{/*
 Expand the name of the chart.
@@ -67,7 +84,7 @@ Create the name of the service account to use
 
 {{- define "accumulo.zookeepers" -}}
   {{- if .Values.zookeeper.enabled -}}
-    {{ template "accumulo.callSubChartTemplate" (list . "zookeeper" "zookeeper.fullname") }}
+    {{ template "accumulo.callSubChartTemplate" (list . "zookeeper" "zookeeper.image") }}
   {{- else -}}
     {{- required ".Values.zookeeper.enabled = false, so .Values.zookeeper.externalHosts must be set" .Values.zookeeper.externalHosts }}
   {{- end -}}
diff --git a/kubernetes/gaffer-jhub/Chart.yaml b/kubernetes/gaffer-jhub/Chart.yaml
index 1426f932..d2d9a9f3 100644
--- a/kubernetes/gaffer-jhub/Chart.yaml
+++ b/kubernetes/gaffer-jhub/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 name: gaffer-jhub
 description: A Jupyter Hub instance, with Gaffer integrations
 type: application
-version: 2.2.2 # managed version
+version: 2.3.0 # managed version
 home: https://github.com/gchq/Gaffer
 sources:
   - https://github.com/gchq/gaffer-docker
diff --git a/kubernetes/gaffer-road-traffic/Chart.yaml b/kubernetes/gaffer-road-traffic/Chart.yaml
index 37a7bf93..8198f35c 100644
--- a/kubernetes/gaffer-road-traffic/Chart.yaml
+++ b/kubernetes/gaffer-road-traffic/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 name: gaffer-road-traffic
 description: A Gaffer instance containing sample GB road traffic data from the Department of Transport
 type: application
-version: 2.2.2 # managed version
+version: 2.3.0 # managed version
 appVersion: 2.2.2 # managed version
 home: https://github.com/gchq/Gaffer
 sources:
@@ -23,5 +23,5 @@ sources:
   - https://data.gov.uk/dataset/208c0e7b-353f-4e2d-8b7a-1a7118467acc/gb-road-traffic-counts
 dependencies:
   - name: gaffer
-    version: ^2.2.2 # managed version
+    version: ^2.3.0 # managed version
     repository: file://../gaffer/
diff --git a/kubernetes/gaffer/Chart.yaml b/kubernetes/gaffer/Chart.yaml
index 26d4050b..5cd8af99 100644
--- a/kubernetes/gaffer/Chart.yaml
+++ b/kubernetes/gaffer/Chart.yaml
@@ -15,13 +15,13 @@ apiVersion: v2
 name: gaffer
 description: A large-scale entity and relation database supporting aggregation of properties
 type: application
-version: 2.2.2 # managed version
+version: 2.3.0 # managed version
 appVersion: 2.2.2
 home: https://github.com/gchq/Gaffer
 sources:
   - https://github.com/gchq/gaffer-docker
 dependencies:
   - name: accumulo
-    version: ^2.2.2 # managed version
+    version: ^2.3.0 # managed version
     repository: file://../accumulo/
     condition: accumulo.enabled
diff --git a/kubernetes/hdfs/Chart.yaml b/kubernetes/hdfs/Chart.yaml
index 7c09921d..48234146 100644
--- a/kubernetes/hdfs/Chart.yaml
+++ b/kubernetes/hdfs/Chart.yaml
@@ -15,5 +15,5 @@ apiVersion: v2
 name: hdfs
 description: Deploys the Hadoop Distributed File System (HDFS)
 type: application
-version: 2.2.2 # managed version
+version: 2.3.0 # managed version
 appVersion: 3.3.3 # managed version