diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4b71468..9ebfab8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,13 +13,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '8', '11', '16', '17', '19', '21', '25' ]
+        java: [ '8', '11', '17', '19', '21', '25' ]
 
     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 }}
         java-package: jdk
@@ -32,7 +32,8 @@ jobs:
 
     - name: Install jNeuroML
       run: |
-        export main_repo_branch=${GITHUB_REF##*/}
+        export main_repo_branch=${GITHUB_REF##*/}        
+        if [[ ${main_repo_branch} == "osb_test_master" ]]; then main_repo_branch=master ; fi
         if [[ ${main_repo_branch} != "master" && ${main_repo_branch} != "development" && ${main_repo_branch} != "experimental" && ${main_repo_branch} != *"osb"* ]]; then main_repo_branch=development ; fi
         echo Using branch $main_repo_branch
         git clone https://github.com/NeuroML/jNeuroML.git
diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml
index 9c218ef..950cfc8 100644
--- a/.github/workflows/omv-ci.yml
+++ b/.github/workflows/omv-ci.yml
@@ -22,18 +22,20 @@ jobs:
           - jNeuroML_EDEN
           - jNeuroML_NEURON
           - jNeuroML_NetPyNE
-          - jNeuroML_MOOSE
           - jNeuroML_validate
           - PyLEMS_NeuroML2
+        #  - jNeuroML_MOOSE # MOOSE disabled, due to latest version not supporting recording/plotting of channel variables, as used in ex5
         exclude:
           - python-version: "3.12"
             engine: jNeuroML_MOOSE  # MOOSE not yet working on py 3.12...
+          - python-version: "3.10"
+            engine: jNeuroML_Brian2  # Brian latest no longer working on py <3.12...
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     
     - name: Set up Python  ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version:  ${{ matrix.python-version }}
 
@@ -46,7 +48,7 @@ jobs:
       run: |
         pip install git+https://github.com/OpenSourceBrain/osb-model-validation
         pip install scipy sympy matplotlib cython pandas tables
-        pip install setuptools --upgrade # needed for Eden on py 3.12
+        pip install setuptools==80 # needed for Eden on py >=3.12