diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml
index 486831b76..1bb5545e8 100644
--- a/.github/workflows/deb.yml
+++ b/.github/workflows/deb.yml
@@ -24,6 +24,9 @@ jobs:
           - name: debian
             codename: stretch
             has32bit: true
+          - name: ubuntu
+            codename: impish
+            has32bit: false
           - name: ubuntu
             codename: hirsute
             has32bit: false
diff --git a/.github/workflows/raspbian.yml b/.github/workflows/raspbian.yml
index f431ab309..f7115e585 100644
--- a/.github/workflows/raspbian.yml
+++ b/.github/workflows/raspbian.yml
@@ -16,6 +16,7 @@ jobs:
       matrix:
         codename:
           - buster
+          - bullseye
 
     runs-on: ubuntu-latest
 
@@ -33,6 +34,10 @@ jobs:
       - name: qemu-user-static
         run: |
           set -exo pipefail
+          . /etc/os-release
+          if [ "$VERSION_ID" = 20.04 ]; then
+            sudo perl -pi -e s/focal/impish/g /etc/apt/sources.list
+          fi
           sudo apt-get update
           DEBIAN_FRONTEND=noninteractive sudo apt-get install -y qemu-user-static
 
diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml
index 4357d35bb..a7e80cc56 100644
--- a/.github/workflows/rpm.yml
+++ b/.github/workflows/rpm.yml
@@ -20,15 +20,15 @@ jobs:
           - name: centos
             release: 7
           - name: fedora
-            release: 34
+            release: 35
           - name: fedora
-            release: 33
+            release: 34
           - name: sles
-            release: '15.2'
+            release: '15.3'
           - name: sles
             release: '12.5'
           - name: opensuse
-            release: '15.2'
+            release: '15.3'
 
     runs-on: ubuntu-latest
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bc456006..75ae599cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -432,10 +432,7 @@ if(NOT MSVC)
   # ARM settings
   if("${ARCH}" STREQUAL "arm")
     check_cxx_source_compiles( "include <atomic>; int main(){ std::atomic<uint_fast64_t> x; x.fetch_add(1); x.sub_add(1);  }" CXX_ATOMIC)
-
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -latomic")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -latomic")
-    set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -latomic")
+    link_libraries(atomic)
   endif()
 
 else()