diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d82efd87..61314d51 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,6 @@ jobs:
         include:
           - { name: Java, id: java, folder: Java }
           - { name: SOM, id: som, folder: SOM }
-          - { name: TruffleSOM, id: trufflesom, folder: SOM }
           - { name: Crystal, id: crystal, folder: Crystal }
           - { name: JavaScript, id: js, folder: JavaScript }
           - { name: SOMns, id: somns, folder: SOMns }
@@ -101,10 +100,8 @@ jobs:
           pushd SOM
           git submodule update --recursive --init
           ant
-        if: matrix.id == 'som'
+          popd
 
-      - name: Install TruffleSOM
-        run: |
           source benchmarks/script.inc
           load_git_repo https://github.com/SOM-st/TruffleSOM.git TruffleSOM
           pushd TruffleSOM
@@ -112,7 +109,7 @@ jobs:
           ./som --setup mx
           ./som --setup labsjdk
           ../mx/mx build
-        if: matrix.id == 'trufflesom'
+        if: matrix.id == 'som'
 
       - name: Python Black Style Check
         uses: psf/black@stable