diff --git a/.github/workflows/bedrock.yml b/.github/workflows/bedrock.yml
index 0e35063d1..d0adb6764 100644
--- a/.github/workflows/bedrock.yml
+++ b/.github/workflows/bedrock.yml
@@ -59,7 +59,7 @@ jobs:
         wget -qO - https://package.perforce.com/perforce.pubkey --no-check-certificate | sudo apt-key add -
         echo "deb [arch=amd64] https://travis:${{ secrets.TRAVIS_APT_PASSWORD }}@$APT_MIRROR_URL/mirror/ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu focal main" | sudo tee -a /etc/apt/sources.list
         sudo apt-get update -y
-        sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install rsyslog cmake gcc-13 g++-13 libsodium-dev libgpgme11-dev libstdc++-13-dev
+        sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install rsyslog cmake libsodium-dev libgpgme11-dev
         sudo locale-gen "en_US.UTF-8"
         sudo service rsyslog start
 
diff --git a/ci_tests.sh b/ci_tests.sh
index 90883b9ed..b7053857a 100755
--- a/ci_tests.sh
+++ b/ci_tests.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-export CXX=/usr/bin/clang-18
-export CC=/usr/bin/clang++-18
+export CXX=/usr/bin/clang++-18
+export CC=/usr/bin/clang-18
 
 # Add the current working directory to $PATH so that tests can find bedrock.
 export PATH=$PATH:`pwd`