diff --git a/.github/workflows/check_compilation.yml b/.github/workflows/check_compilation.yml
index d0f3a725..8a407607 100644
--- a/.github/workflows/check_compilation.yml
+++ b/.github/workflows/check_compilation.yml
@@ -14,19 +14,30 @@ jobs:
       - name: Setup submodules
         run: git submodule update --init --recursive
 
-      # - name: Setup system
-      #   run: |
-      #     sudo apt-get update
-      #     sudo apt-get install -y autotools-dev automake autoconf pkg-config
-      #     sudo apt-get install -y openmpi-bin libopenmpi-dev
-      #     sudo apt-get install -y libopenblas-dev liblapack-dev
-
-      - name: Setup system cached
+      - name: Setup system cache
         uses: awalsh128/cache-apt-pkgs-action@latest
         with:
           packages: autotools-dev automake autoconf pkg-config openmpi-bin libopenmpi-dev libopenblas-dev liblapack-dev
           version: 1.0
 
+      - name: Cache json-fortran
+        id: cache-json-fortran
+        uses: actions/cache@v3
+        with:
+          path: ~/pkg/json-fortran
+          key: json-fortran-${{ runner.os }}-${{ matrix.os }}-${{ matrix.compiler }}
+      - name: Install json-fortran
+        if: ${{ (steps.cache-json-fortran.outputs.cache-hit != 'true') }}
+        run: |
+          cmake -B external/json-fortran/build -S external/json-fortran -DCMAKE_INSTALL_PREFIX=${HOME}/pkg/json-fortran -DUSE_GNU_INSTALL_CONVENTION=ON ..
+          cmake --build external/json-fortran/build --parallel $(nproc)
+          cmake --install external/json-fortran/build --parallel $(nproc)
+          rm -f ${HOME}/pkg/json-fortran/lib/*.dylib
+
+      - name: Setup json-fortran
+        run: |
+          export JSON_FORTRAN_DIR=${HOME}/pkg/json-fortran/lib/*.dylib
+
       - name: Build
         run: |
           ./setup.sh --test
diff --git a/.github/workflows/check_documentation.yml b/.github/workflows/check_documentation.yml
index e07d2ade..01fca701 100644
--- a/.github/workflows/check_documentation.yml
+++ b/.github/workflows/check_documentation.yml
@@ -6,6 +6,7 @@ on: [workflow_call]
 
 jobs:
   test_documentation:
+    name: Test the documenation build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
diff --git a/.github/workflows/pr_develop.yml b/.github/workflows/pr_develop.yml
index f4791169..83abd40d 100644
--- a/.github/workflows/pr_develop.yml
+++ b/.github/workflows/pr_develop.yml
@@ -1,4 +1,3 @@
-# cat .github/workflows/deploy.yml
 name: Check Development PRs
 on:
 # Todo: Remove the push events before merging to develop
diff --git a/.github/workflows/pr_main.yml b/.github/workflows/pr_main.yml
index 213ab334..52db5fd2 100644
--- a/.github/workflows/pr_main.yml
+++ b/.github/workflows/pr_main.yml
@@ -4,27 +4,27 @@
 
 
 # name: Check Development PRs
-# on:
-#   pull_request:
-#     branches: [main]
+on:
+  pull_request:
+    branches: [main]
 
-# jobs:
-#   # Pull in the external workflows so we avoid duplication
-#   check_documentation:
-#     uses: ./.github/workflows/check_documentation.yml
-#   check_formatting:
-#     uses: ./.github/workflows/check_formatting.yml
-#   check_compilation:
-#     uses: ./.github/workflows/check_compilation.yml
+jobs:
+  # Pull in the external workflows so we avoid duplication
+  check_documentation:
+    uses: ./.github/workflows/check_documentation.yml
+  check_formatting:
+    uses: ./.github/workflows/check_formatting.yml
+  check_compilation:
+    uses: ./.github/workflows/check_compilation.yml
 
-#   # Dummy job to trigger the other jobs
-#   check-develop:
-#     name: Run all checks for development PRs
-#     needs:
-#       - check_documentation
-#       - check_formatting
-#       - check_compilation
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Success
-#         run: echo "All checks passed"
+  # Dummy job to trigger the other jobs
+  check-develop:
+    name: Run all checks for development PRs
+    needs:
+      - check_documentation
+      - check_formatting
+      - check_compilation
+    runs-on: ubuntu-latest
+    steps:
+      - name: Success
+        run: echo "All checks passed"
diff --git a/external/Nek5000 b/external/Nek5000
index 57abc6c6..b514e457 160000
--- a/external/Nek5000
+++ b/external/Nek5000
@@ -1 +1 @@
-Subproject commit 57abc6c60a4ed23dbd2463786cf9ee6bbcd7ecae
+Subproject commit b514e457d11475b1a810c50668543b5deb396d31
diff --git a/external/json-fortran b/external/json-fortran
index 78199196..18ef4c60 160000
--- a/external/json-fortran
+++ b/external/json-fortran
@@ -1 +1 @@
-Subproject commit 78199196acb2eb91b274b602ad9fa267e715f51b
+Subproject commit 18ef4c60493b7b9fbf41b48bb8e3970e59b57b53
diff --git a/external/neko b/external/neko
index 527b96a7..c4feae90 160000
--- a/external/neko
+++ b/external/neko
@@ -1 +1 @@
-Subproject commit 527b96a743f4c70e14957f06d44f9492c06478bc
+Subproject commit c4feae90abe6934b9a81f71f8250c2a882991cd0