diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index 376494010c3..653fbf0c135 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -13,7 +13,7 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
-#    if: github.event.pull_request.draft == false
+    if: github.event.pull_request.draft == false
     steps:
     - uses: actions/checkout@v3
     - name: Install system dependencies
diff --git a/.github/workflows/linux-sampleapp-ci.yml b/.github/workflows/linux-sampleapp-ci.yml
index 947069d319e..da1aa11656b 100644
--- a/.github/workflows/linux-sampleapp-ci.yml
+++ b/.github/workflows/linux-sampleapp-ci.yml
@@ -15,26 +15,17 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.draft == false
     steps:
-    # Work around https://github.com/actions/runner-images/issues/8659
-    - name: Remove GCC 13 from runner image
-      shell: bash
-      run: |
-          # Work around https://github.com/actions/runner-images/issues/9733
-          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
-          sudo apt-get update
-          sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.7 libc6-dev=2.35-0ubuntu3.7 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
     - uses: actions/checkout@v3
     - name: Install system dependencies
       run: |
-        tools/install-sys-dependencies-linux
+        tools/install-sys-dependencies-linux ci
         tools/install-rust-dependencies
     - name: Cache internal dependencies
       id: internal_cache
       uses: actions/cache@v3
       with:
         path: build/local
-        key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-dependencies') }}
+        key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-sys-dependencies-linux') }}-${{ hashFiles('tools/install-dependencies') }}
     - name: Install internal dependencies
       run: |
         tools/install-dependencies
diff --git a/tools/install-sys-dependencies-linux b/tools/install-sys-dependencies-linux
index 3527b6faba3..eec6524cd06 100755
--- a/tools/install-sys-dependencies-linux
+++ b/tools/install-sys-dependencies-linux
@@ -2,9 +2,6 @@
 
 set -e
 
-# build-essential clang-14 libc++-dev libc++abi-dev ruby-full cmake
-sudo apt-get update && sudo apt-get install ninja-build lcov llvm-14 clang-tidy-14 libboost-all-dev rustc --fix-missing
-
 # Downgrade libc to temporarily fix https://github.com/actions/runner-images/issues/8659
 if [[ "$1" == "ci" ]]; then
   LIBSTD_PACKAGE_VERSION="12.3.0-1ubuntu1~22.04"
@@ -22,3 +19,6 @@ if [[ "$1" == "ci" ]]; then
     libstdc++6=$LIBSTD_PACKAGE_VERSION \
     libgcc-s1=$LIBSTD_PACKAGE_VERSION
 fi
+
+# build-essential clang-14 libc++-dev libc++abi-dev ruby-full cmake
+sudo apt-get update && sudo apt-get install ninja-build lcov llvm-14 clang-tidy-14 libboost-all-dev rustc --fix-missing