diff --git a/.github/workflows/update-gaffer-version.yaml b/.github/workflows/update-gaffer-version.yaml
index 65d5989fa..efc51d446 100644
--- a/.github/workflows/update-gaffer-version.yaml
+++ b/.github/workflows/update-gaffer-version.yaml
@@ -14,32 +14,40 @@ jobs:
       VERSION_UPDATE_BRANCH: updating-gaffer-version-${{ github.event.inputs.version }}
 
     steps:
-    - name: Checkout branch
-      uses: actions/checkout@v2
-      with:
-        token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
-
-    - name: Get branch name
-      run: echo "SOURCE_BRANCH=$(git branch --show-current)" >> $GITHUB_ENV
-
-    - name: Set up Github credentials
-      run: |
-        git config user.name Gaffer
-        git config user.email github-actions@github.com
+    - name: Checkout base branch
+      uses: actions/checkout@v3
 
     - name: Setup JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: '8'
 
     - name: Update Gaffer Version
-      run: ./cd/updateGafferVersion.sh ${{ github.event.inputs.version }}
+      run: |
+        mvn -q org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.parent.version
+        oldVersion=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.parent.version | grep -v '\['`
+        newVersion=${{ github.event.inputs.version }}
+
+        sed -i'' "s#version>$oldVersion<#version>$newVersion<#g" pom.xml
+        sed -i'' "s#gaffer2:$oldVersion#gaffer2:$newVersion#g" NOTICES
+
+        sed -i'' "s#__version__ = \"$oldVersion\"#__version__ = \"$newVersion\"#g" python-shell/__init__.py
+        sed -i'' "s#__version__ = \"$oldVersion\"#__version__ = \"$newVersion\"#g" python-shell/src/__init__.py
+        sed -i'' "s#__version__ = \"$oldVersion\"#__version__ = \"$newVersion\"#g" python-shell/src/*/__init__.py
+
+    - name: Update gafferpy
+      run: |
+        newVersion=${{ github.event.inputs.version }}
+        curl -o spring-rest.jar https://repo.maven.apache.org/maven2/uk/gov/gchq/gaffer/spring-rest/$newVersion/spring-rest-$newVersion-exec.jar
+        java -Dgaffer.schemas=ui/example/road-traffic/schema/ -Dgaffer.storeProperties=ui/example/federated/federatedStore.properties -Dgaffer.graph.config=ui/example/federated/graphConfig.json -jar spring-rest.jar &
+        sleep 1m
+        python python-shell/src/generate.py
+        rm spring-rest.jar
 
     - name: Submit PR
-      if: ${{ success() }}
-      uses: repo-sync/pull-request@v2
+      uses: peter-evans/create-pull-request@v4
       with:
-        source_branch: ${{ env.VERSION_UPDATE_BRANCH }}
-        destination_branch: ${{ env.SOURCE_BRANCH }}
-        github_token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+        title: Updated Gaffer version to ${{ github.event.inputs.version }}
+        commit-message: Updated Gaffer version to ${{ github.event.inputs.version }}
+        branch: ${{ env.VERSION_UPDATE_BRANCH }}
diff --git a/cd/updateGafferVersion.sh b/cd/updateGafferVersion.sh
deleted file mode 100755
index 2e1f7a472..000000000
--- a/cd/updateGafferVersion.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$1" ]; then
-    echo "Usage: ./updateGafferVersion.sh <new version>"
-    exit 1
-fi
-
-
-newVersion=$1
-
-git checkout -b updating-gaffer-version-$newVersion
-
-
-mvn -q org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.parent.version
-oldVersion=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.parent.version | grep -v '\['`
-
-
-sed -i'' "s/version>$oldVersion</version>$newVersion</g" pom.xml
-sed -i'' "s/gaffer2:$oldVersion/gaffer2:$newVersion/g" NOTICES
-
-sed -i'' "s/__version__ = \"$oldVersion\"/__version__ = \"$newVersion\"/g" python-shell/__init__.py
-sed -i'' "s/__version__ = \"$oldVersion\"/__version__ = \"$newVersion\"/g" python-shell/src/__init__.py
-sed -i'' "s/__version__ = \"$oldVersion\"/__version__ = \"$newVersion\"/g" python-shell/src/gafferpy/__init__.py
-sed -i'' "s/__version__ = \"$oldVersion\"/__version__ = \"$newVersion\"/g" python-shell/src/fishbowl/__init__.py
-sed -i'' "s/__version__ = \"$oldVersion\"/__version__ = \"$newVersion\"/g" python-shell/src/gafferpy_examples/__init__.py
-sed -i'' "s/__version__ = \"$oldVersion\"/__version__ = \"$newVersion\"/g" python-shell/src/test/__init__.py
-
-git add pom.xml
-git add NOTICES
-git add python-shell/__init__.py
-git add python-shell/src/__init__.py
-git add python-shell/src/gafferpy/__init__.py
-
-git commit -a -m "Updated Gaffer version to $newVersion"
-git push -u origin updating-gaffer-version-$newVersion