diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 51fa29358..9cd0ad566 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -144,9 +144,9 @@ jobs:
     - name: '🟦 Setup MSYS2'
       uses: msys2/setup-msys2@v2
       with:
-        msystem: MINGW64
+        msystem: mingw64
         update: true
-        install: mingw-w64-x86_64-python-pip
+        install: mingw-w64-x86_64-python-pip	
 
     - name: '🧰 Checkout'
       uses: actions/checkout@v4
@@ -154,9 +154,10 @@ jobs:
         submodules: recursive
 
     - name: '⚙️ Setup GHDL'
-      uses: ghdl/setup-ghdl-ci@master
+      uses: ghdl/setup-ghdl@main
       with:
-        backend: llvm
+        backend: mcode
+        runtime: mingw64
 
     - name: '🐍 Install dependencies'
       run: pip install -U tox --progress-bar off
diff --git a/docs/ci/manual.rst b/docs/ci/manual.rst
index c164aaa3e..510852703 100644
--- a/docs/ci/manual.rst
+++ b/docs/ci/manual.rst
@@ -19,7 +19,7 @@ There are six possible procedures to setup GHDL:
 
    * Get and extract a tarball/zipfile from the *nightly* pre-release: `github.com/ghdl/ghdl/releases/nightly <https://github.com/ghdl/ghdl/releases/nightly>`_.
 
-      * (On GitHub Actions only) Use Action `ghdl/setup-ghdl-ci <https://github.com/ghdl/setup-ghdl-ci>`_.
+      * (On GitHub Actions only) Use Action `ghdl/setup-ghdl <https://github.com/ghdl/setup-ghdl>`_.
 
 * Use one of the Docker/OCI images provided in `ghdl/docker <https://github.com/ghdl/docker>`_.
 
diff --git a/docs/ci/usecases.rst b/docs/ci/usecases.rst
index 78dc547ce..604c8b80f 100644
--- a/docs/ci/usecases.rst
+++ b/docs/ci/usecases.rst
@@ -33,7 +33,7 @@ This is equivalent to *lin-vunit*, but it is slightly more verbose.
 lin-setup
 *********
 
-Uses *JavaScript Action* `ghdl/setup-ghdl-ci <https://github.com/ghdl/setup-ghdl-ci>`_ to install GHDL on the Ubuntu host/VM.
+Uses *JavaScript Action* `ghdl/setup-ghdl <https://github.com/ghdl/setup-ghdl>`_ to install GHDL on the Ubuntu host/VM.
 Then, additional system packages and Python packages are installed explicitly.
 
 Compared to previous approaches, in this case runtime dependencies are not pre-installed. As a result, startup is slightly
@@ -42,7 +42,7 @@ slower.
 win-setup
 *********
 
-Uses Actions `ghdl/setup-ghdl-ci <https://github.com/ghdl/setup-ghdl-ci>`_ and `msys2/setup-msys2 <https://github.com/msys2/setup-msys2>`_
+Uses Actions `ghdl/setup-ghdl <https://github.com/ghdl/setup-ghdl>`_ and `msys2/setup-msys2 <https://github.com/msys2/setup-msys2>`_
 to install latest *nightly* GHDL, other MSYS2 packages and Python packages in a *clean* MINGW64 environment.
 
 This is the recommended approach to run tests on Windows. Action setup-msys2 caches installed packages/dependencies