diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
index 817b43c3a..7aed6c0b2 100644
--- a/.github/workflows/continuous-integration.yaml
+++ b/.github/workflows/continuous-integration.yaml
@@ -12,7 +12,7 @@ jobs:
   autopep8:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: autopep8
         id: autopep8
         uses: peter-evans/autopep8@v1
@@ -39,16 +39,16 @@ jobs:
   check-all-modules-are-tested:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Check all modules are tested
       run: ./cd/check_modules.sh
 
   python-tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: '8'
@@ -87,7 +87,7 @@ jobs:
         fetch-depth: 0
 
     - name: Setup JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/create-alpha-release-branch.yaml b/.github/workflows/create-alpha-release-branch.yaml
index 4bacdf0c1..c92ac85e4 100644
--- a/.github/workflows/create-alpha-release-branch.yaml
+++ b/.github/workflows/create-alpha-release-branch.yaml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: Checkout v2-alpha
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: v2-alpha
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
diff --git a/.github/workflows/create-hotfix-branch.yaml b/.github/workflows/create-hotfix-branch.yaml
index 043299a5d..83c25b437 100644
--- a/.github/workflows/create-hotfix-branch.yaml
+++ b/.github/workflows/create-hotfix-branch.yaml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: Checkout master
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: master
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
diff --git a/.github/workflows/create-release-branch.yaml b/.github/workflows/create-release-branch.yaml
index 81d3f6292..6e19b0581 100644
--- a/.github/workflows/create-release-branch.yaml
+++ b/.github/workflows/create-release-branch.yaml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: Checkout develop
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: develop
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
diff --git a/.github/workflows/release-standalone.yaml b/.github/workflows/release-standalone.yaml
index 15840055d..e66c06c86 100644
--- a/.github/workflows/release-standalone.yaml
+++ b/.github/workflows/release-standalone.yaml
@@ -7,13 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Setup JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: '8'
 
     - name: Checkout Branch
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Decode CodeSigning key
       env:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 0a602f967..66bdb0b7c 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -19,13 +19,13 @@ jobs:
 
     steps:
     - name: Setup JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: '8'
 
     - name: Checkout master
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: master
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
@@ -59,7 +59,7 @@ jobs:
       run: echo "MASTER_BRANCH=master" >> $GITHUB_ENV
 
     - name: Checkout master
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: ${{ env.MASTER_BRANCH }}
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
@@ -92,7 +92,7 @@ jobs:
       run: echo "DEVELOP_BRANCH=v2-alpha" >> $GITHUB_ENV
 
     - name: Checkout develop
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: develop
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
@@ -104,7 +104,7 @@ jobs:
         git config user.email github-actions@github.com
 
     - name: Setup JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: '8'
@@ -131,7 +131,7 @@ jobs:
 
     steps:
     - name: Checkout Master
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: master
 
@@ -162,7 +162,7 @@ jobs:
 
     steps:
     - name: Checkout Master
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: master
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
@@ -173,10 +173,10 @@ jobs:
         git config user.email github-actions@github.com
 
     - name: Setup JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: '8'
+        java-version: '11'
 
     - name: Set version
       run: echo "RELEASE_VERSION=$(echo ${{ github.event.milestone.title }} | cut -c 2-)" >> $GITHUB_ENV
@@ -186,9 +186,11 @@ jobs:
         git remote set-branches --add origin gh-pages
         git pull
         mvn -q clean install -Pquick -Dskip.jar-with-dependencies=true -Dshaded.jar.phase=true
-        mvn -q javadoc:javadoc -Pquick
+        mvn -q javadoc:aggregate
         git checkout gh-pages
         rm -rf uk
+        rm -rf jquery
+        rm -rf resources
         mv target/site/apidocs/* .
         git add .
         git commit -a -m "Updated javadoc - $RELEASE_VERSION"
@@ -201,13 +203,13 @@ jobs:
 
     steps:
     - name: Setup JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: '8'
 
     - name: Checkout release
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: ${{ needs.create-release-tag.outputs.branch_name }}