diff --git a/.github/workflows/dockermatrix.yml b/.github/workflows/dockermatrix.yml
index 4d5ef7d..3047fe6 100644
--- a/.github/workflows/dockermatrix.yml
+++ b/.github/workflows/dockermatrix.yml
@@ -1,9 +1,9 @@
 on:
     push:
-        branches: '**'
+        branches: ['**']
 #        branches: 'master'
 #        branches: 'devel'
-        tags: '' # Restrict to blank tags
+        tags-ignore: ['**']  # Ignore all tag pushes
     pull_request:
 #        branches: 'devel'
 
@@ -22,7 +22,9 @@ jobs:
             #
             #- { img: 'lebarsfa/pi-64:focal-for-codac', shell: bash, arch: arm64, bitness: 64, runtime: focal, desc: 'Ubuntu 20.04 arm64' }
             #- { img: 'arm64v8/ubuntu:focal', shell: bash, arch: arm64, bitness: 64, runtime: focal, docker_flags: '--platform linux/arm64', desc: 'Ubuntu 20.04 arm64' }
-            - { img: 'amd64/ubuntu:focal', shell: bash, arch: amd64, bitness: 64, runtime: focal, docker_flags: '--platform linux/amd64', desc: 'Ubuntu 20.04 amd64' }
+            #- { img: 'amd64/ubuntu:focal', shell: bash, arch: amd64, bitness: 64, runtime: focal, docker_flags: '--platform linux/amd64', desc: 'Ubuntu 20.04 amd64' }
+            #- { img: 'arm64v8/ubuntu:jammy', shell: bash, arch: arm64, bitness: 64, runtime: jammy, docker_flags: '--platform linux/arm64', desc: 'Ubuntu 22.04 arm64' }
+            - { img: 'amd64/ubuntu:jammy', shell: bash, arch: amd64, bitness: 64, runtime: jammy, docker_flags: '--platform linux/amd64', desc: 'Ubuntu 22.04 amd64' }
     name: ${{ matrix.cfg.desc }}
     steps: 
     - uses: actions/checkout@v4
diff --git a/.github/workflows/unixmatrix.yml b/.github/workflows/unixmatrix.yml
index 55e5e8d..c4ba406 100644
--- a/.github/workflows/unixmatrix.yml
+++ b/.github/workflows/unixmatrix.yml
@@ -1,8 +1,8 @@
 on:
     push:
-        branches: '**'
+        branches: ['**']
 #        branches: 'master'
-        tags: '' # Restrict to blank tags
+        tags-ignore: ['**']  # Ignore all tag pushes
     pull_request:
 
 jobs:
@@ -38,7 +38,7 @@ jobs:
             # Current workaround is to use Intel app with Rosetta...
             #
             #- { os: macos-14, shell: bash, arch: arm64, bitness: 64, runtime: sonoma, desc: 'macOS Sonoma arm64' }
-            - { os: macos-13, shell: bash, arch: x86_64, bitness: 64, runtime: ventura, desc: 'macOS Ventura x86_64' }
+            - { os: macos-15-intel, shell: bash, arch: x86_64, bitness: 64, runtime: sonoma, desc: 'macOS Sonoma x86_64' } # Not clear whether it is more Sequoia or Sonoma, see https://github.com/actions/runner-images/issues/13045...
     name: ${{ matrix.cfg.desc }}
     steps: 
     - uses: actions/checkout@v4