diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 50fc7400e84a..2ecab498e974 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -176,8 +176,10 @@ jobs:
     - name: Install LLVM 15 for 20.04
       if: ${{ matrix.os.code == 'ubuntu2004' && matrix.env.CC == 'clang' }}
       run: |
-        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add
-        sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main"
+        install -d -m 0755 -o root -g root /etc/apt/keyrings
+        wget -O /etc/apt/keyrings/llvm-snapshot.asc https://apt.llvm.org/llvm-snapshot.gpg.key
+        echo "deb [signed-by=/etc/apt/keyrings/llvm-snapshot.asc] http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main" | sudo tee /etc/apt/sources.list.d/llvm-toolchain.list
+        sudo apt-get update
         sudo apt-get install ${APT_OPTS} clang-15 llvm-15 gdb libclang-rt-15-dev
         sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-15 60 && sudo update-alternatives --set clang /usr/bin/clang-15
         sudo update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-15 60 && sudo update-alternatives --set llvm-symbolizer /usr/bin/llvm-symbolizer-15
@@ -299,9 +301,9 @@ jobs:
     - name: Add OpenResty repository
       shell: bash
       run: |
-        wget -O - https://openresty.org/package/pubkey.gpg | sudo apt-key add -
-        echo "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/openresty.list
-
+        install -d -m 0755 -o root -g root /etc/apt/keyrings
+        wget -O /etc/apt/keyrings/openresty.asc https://openresty.org/package/pubkey.gpg
+        echo "deb [signed-by=/etc/apt/keyrings/openresty.asc] http://openresty.org/package/ubuntu $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/openresty.list
         sudo apt-get update
 
     - name: Setup git