diff --git a/.github/workflows/authors-file.yml b/.github/workflows/authors-file.yml
index 3970aee681d..9e13ab6862a 100644
--- a/.github/workflows/authors-file.yml
+++ b/.github/workflows/authors-file.yml
@@ -20,8 +20,8 @@ jobs:
           sort -uo AUTHORS AUTHORS
           git add AUTHORS
           git log --format='format:%aN <%aE>' "$(
-            git merge-base "origin/$GITHUB_BASE_REF" "origin/$GITHUB_HEAD_REF"
-          )..origin/$GITHUB_HEAD_REF" >> AUTHORS
+            git merge-base HEAD^1 HEAD^2
+          )..HEAD^2" >> AUTHORS
           sort -uo AUTHORS AUTHORS
           git diff AUTHORS >> AUTHORS.diff
 
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index dc23459e04e..575db1c68e2 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - master
-      - 'support/*'
   release:
     types:
       - published
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 6c3c5dd6ec3..3eda27df270 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -24,12 +24,12 @@ jobs:
           - amazonlinux:2
           - amazonlinux:2023
           - centos:7 # and RHEL 7
-          - debian:10
           - debian:11 # and Raspbian 11
           - debian:12 # and Raspbian 12
           - fedora:37
           - fedora:38
           - fedora:39
+          - fedora:40
           - opensuse/leap:15.3 # SLES 15.3
           - opensuse/leap:15.4 # and SLES 15.4
           - opensuse/leap:15.5 # and SLES 15.5
@@ -39,6 +39,7 @@ jobs:
           - ubuntu:22.04
           - ubuntu:23.04
           - ubuntu:23.10
+          - ubuntu:24.04
 
     steps:
       - name: Checkout HEAD
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3bdf29acbd..730eda6f71a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -495,6 +495,7 @@ set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}/icinga-installer/dlgbmp.bmp
 set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/icinga-installer/icinga2.wixpatch.Debug")
 set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/icinga-installer/icinga2.wixpatch")
 set(CPACK_WIX_EXTENSIONS "WixUtilExtension" "WixNetFxExtension")
+set(CPACK_WIX_INSTALL_SCOPE NONE)
 
 set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "sbin")
 set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)