diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ccaee688..f5d87682 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [ '8', '11', '16', '17', '19', '21' ]
-        runs-on: [ubuntu-latest, macos-13, windows-2019] # Note macos-13, not latest/14, due to hdf5 install issue
+        runs-on: [ubuntu-latest, macos-15-intel, windows-latest] # Note macos-15-intel, not latest/14, due to hdf5 install issue
         exclude:
           - runs-on: macos-latest
             java: "8"
@@ -26,9 +26,9 @@ jobs:
 
     name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up JDK ${{ matrix.Java }}
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: ${{ matrix.Java }}
         distribution: 'temurin'
@@ -36,7 +36,7 @@ jobs:
     - name: Install and test (non Win)
       env:
         main_repo_branch: ${GITHUB_REF_NAME}
-      if: ${{ matrix.runs-on != 'windows-2019' }}
+      if: ${{ ! contains(matrix.runs-on, 'windows') }}
       run: |
         export main_repo_branch=${{env.main_repo_branch}}
         if [[ ${main_repo_branch} != "master" && ${main_repo_branch} != "development" && ${main_repo_branch} != "experimental" && ${main_repo_branch} != *"osb"* ]]; then main_repo_branch=development ; fi
@@ -72,7 +72,7 @@ jobs:
         mvn dependency:tree
 
     - name: Install and test (Win)
-      if: ${{ matrix.runs-on == 'windows-2019' }}
+      if: ${{ contains(matrix.runs-on, 'windows') }}
       run: |
         # Install org.neuroml.model.injectingplugin
 
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 380031c4..36e2cafb 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -13,20 +13,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: nelonoel/branch-name@v1.0.1
 
-    - name: Set up JDK 11
-      uses: actions/setup-java@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v5
       with:
-        java-version: 11
+        java-version: 21
         distribution: 'temurin'
         java-package: jdk
 
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v5
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v6
       with:
-        python-version: 3.9
+        python-version: 3.12
 
     - name: Install GH import
       run: |
@@ -34,14 +34,14 @@ jobs:
         pip install ghp-import
 
     - name: Checkout NeuroML2
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         repository: NeuroML/NeuroML2
         ref: development
         path: NeuroML2
 
     - name: Checkout org.lemsml
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         repository: LEMS/jLEMS
         ref: development
@@ -49,14 +49,14 @@ jobs:
 
 
     - name: Checkout org.neuroml.model.injectingplugin
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         repository: NeuroML/org.neuroml.model.injectingplugin
         ref: development
         path: org.neuroml.model.injectingplugin
 
     - name: Checkout org.neuroml.model
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         repository: NeuroML/org.neuroml.model
         ref: development