diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e27b6a23d..52d3f4f0d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,10 +13,6 @@ jobs:
       - name: Setup CCache
         uses: hendrikmuhs/ccache-action@v1.2
 
-      - uses: ghdl/setup-ghdl-ci@master
-        with:
-          backend: llvm
-
       # Install Tools
       - name: Install Tools
         run: |
@@ -47,6 +43,16 @@ jobs:
           sudo python3 litex_setup.py --gcc=openrisc
           sudo python3 litex_setup.py --gcc=powerpc
 
+      # Build / Install GHDL
+      - name: Build GHDL
+        run: |
+          sudo apt-get install gnat llvm
+          git clone https://github.com/ghdl/ghdl.git
+          cd ghdl
+          ./configure --with-llvm-config
+          make
+          sudo make install
+
       # Build / Install Verilator
       - name: Build Verilator
         run: |