diff --git a/.github/workflows/install-from-source.yml b/.github/workflows/install-from-source.yml
index a01af46437..fa8fb17a40 100644
--- a/.github/workflows/install-from-source.yml
+++ b/.github/workflows/install-from-source.yml
@@ -19,6 +19,7 @@ on:
   push:
     branches:
       - main
+      - GA_update_condamamba_adhoc
   # run the test only if the PR is to main
   # turn it on if required
   #pull_request:
@@ -52,6 +53,17 @@ jobs:
           miniforge-version: "latest"
           miniforge-variant: Mambaforge
           use-mamba: true
+      - name: Update conda and mamba
+        run: |
+          # setup-miniconda@v2 installs an old conda and mamba
+          # forcing a modern mamba updates both mamba and conda
+          # this and next step should be removed when updated upstream
+          conda update -n base -c conda-forge conda
+          conda install -c conda-forge "mamba>=1.4.8"
+          conda --version
+          mamba --version
+      - name: Update environment with new mamba
+        run: mamba update -c conda-forge -f environment.yml
       - run: mkdir -p source_install_linux_artifacts_python_${{ matrix.python-version }}
       - name: Record versions
         run: |
@@ -89,6 +101,17 @@ jobs:
           miniforge-version: "latest"
           miniforge-variant: Mambaforge
           use-mamba: true
+      - name: Update conda and mamba
+        run: |
+          # setup-miniconda@v2 installs an old conda and mamba
+          # forcing a modern mamba updates both mamba and conda
+          # this and next step should be removed when updated upstream
+          conda update -n base -c conda-forge conda
+          conda install -c conda-forge "mamba>=1.4.8"
+          conda --version
+          mamba --version
+      - name: Update environment with new mamba
+        run: mamba update -c conda-forge -f environment.yml
       - run: mkdir -p source_install_osx_artifacts_python_${{ matrix.python-version }}
       - name: Record versions
         run: |
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index aa80283eb9..7d5e388bc9 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -21,6 +21,7 @@ on:
   push:
     branches:
       - main
+      - GA_update_condamamba_adhoc
   # run the test only if the PR is to main
   # turn it on if required
   #pull_request:
@@ -54,6 +55,17 @@ jobs:
           miniforge-version: "latest"
           miniforge-variant: Mambaforge
           use-mamba: true
+      - name: Update conda and mamba
+        run: |
+          # setup-miniconda@v2 installs an old conda and mamba
+          # forcing a modern mamba updates both mamba and conda
+          # this and next step should be removed when updated upstream
+          conda update -n base -c conda-forge conda
+          conda install -c conda-forge "mamba>=1.4.8"
+          conda --version
+          mamba --version
+      - name: Update environment with new mamba
+        run: mamba update -c conda-forge -f environment.yml
       - run: mkdir -p test_linux_artifacts_python_${{ matrix.python-version }}
       - run: conda --version 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/conda_version.txt
       - run: python -V 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/python_version.txt
@@ -86,6 +98,17 @@ jobs:
           miniforge-version: "latest"
           miniforge-variant: Mambaforge
           use-mamba: true
+      - name: Update conda and mamba
+        run: |
+          # setup-miniconda@v2 installs an old conda and mamba
+          # forcing a modern mamba updates both mamba and conda
+          # this and next step should be removed when updated upstream
+          conda update -n base -c conda-forge conda
+          conda install -c conda-forge "mamba>=1.4.8"
+          conda --version
+          mamba --version
+      - name: Update environment with new mamba
+        run: mamba update -c conda-forge -f environment.yml
       - run: mkdir -p test_osx_artifacts_python_${{ matrix.python-version }}
       - run: conda --version 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/conda_version.txt
       - run: python -V 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/python_version.txt