diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cf85442c4..e57372165 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ env:
 jobs:
   build-release:
     name: Build Release Candidate
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       BUILD_RELEASE: 1
     steps:
@@ -33,7 +33,7 @@ jobs:
         run: scripts/build.sh
   lint:
     name: Lint
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
         with:
@@ -48,7 +48,7 @@ jobs:
         run: scripts/lint.sh
   unit-and-integration-test:
     name: Unit and Integration Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v2
@@ -76,7 +76,7 @@ jobs:
           retention-days: 7
   doxygen:
     name: doxygen
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 07dcc5d37..3c54c02ff 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -12,7 +12,7 @@ defaults:
 jobs:
   gh-pages-deploy:
     name: Github Pages Deploy
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
diff --git a/scripts/install-build-tools.sh b/scripts/install-build-tools.sh
index 592e8929b..8654ba22b 100755
--- a/scripts/install-build-tools.sh
+++ b/scripts/install-build-tools.sh
@@ -31,11 +31,16 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 fi
 
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    $SUDO apt update
+    $SUDO apt update -y
     $SUDO apt install -y build-essential wget cmake libgtest-dev libbenchmark-dev lcov git software-properties-common rsync unzip
 
-    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | $SUDO apt-key add -
-    $SUDO add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main"
+    # Add LLVM GPG key (apt-key is deprecated in Ubuntu 21.04+ so using gpg)
+    wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | \
+        gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
+    echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/focal/ llvm-toolchain-focal main" | \
+        $SUDO tee /etc/apt/sources.list.d/llvm.list
+
+    $SUDO apt update -y
     $SUDO apt install -y clang-format-14 clang-tidy-14
     $SUDO ln -s -f $(which clang-format-14) /usr/local/bin/clang-format
     $SUDO ln -s -f $(which clang-tidy-14) /usr/local/bin/clang-tidy