diff --git a/.github/workflows/build-special.yml b/.github/workflows/build-special.yml
index 02d19668c..fda1c2b91 100644
--- a/.github/workflows/build-special.yml
+++ b/.github/workflows/build-special.yml
@@ -92,9 +92,15 @@ jobs:
 
           sudo apt-get -y install cmake build-essential pkg-config libpython3-dev python3-numpy libicu-dev
 
-          sudo apt-get install -y clang-${{ matrix.version }} g++-multilib
-          echo "CC=clang-${{ matrix.version }}" >> $GITHUB_ENV
-          echo "CXX=clang++-${{ matrix.version }}" >> $GITHUB_ENV
+          if [ "${{ matrix.compiler }}" = "gcc" ]; then
+            sudo apt-get install -y g++-${{ matrix.version }} g++-${{ matrix.version }}-multilib
+            echo "CC=gcc-${{ matrix.version }}" >> $GITHUB_ENV
+            echo "CXX=g++-${{ matrix.version }}" >> $GITHUB_ENV
+          else
+            sudo apt-get install -y clang-${{ matrix.version }} g++-multilib
+            echo "CC=clang-${{ matrix.version }}" >> $GITHUB_ENV
+            echo "CXX=clang++-${{ matrix.version }}" >> $GITHUB_ENV
+          fi
 
       - name: Install Boost
         if: runner.os == 'Linux'
@@ -150,6 +156,12 @@ jobs:
           echo "GTSAM_USE_BOOST_FEATURES=OFF" >> $GITHUB_ENV
           echo "GTSAM will not use BOOST"
 
+      - name: Set Swap Space
+        if: runner.os == 'Linux'
+        uses: pierotofy/set-swap-space@master
+        with:
+          swap-size-gb: 12
+
       - name: Build & Test
         run: |
           bash .github/scripts/unix.sh -t