diff --git a/.github/commands/ci-setup b/.github/commands/ci-setup
index 4c33bd55e..a6e0cd77c 100755
--- a/.github/commands/ci-setup
+++ b/.github/commands/ci-setup
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -eo pipefail
-set -x
 
 DOKKU_DOMAIN=${DOKKU_DOMAIN:="dokku.me"}
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64e5c1dcf..91d5a7b01 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ env:
 
 jobs:
   check-commit:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       skip: ${{ steps.check-commit.outputs.skip }}
 
@@ -43,7 +43,7 @@ jobs:
 
   build:
     name: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: check-commit
     if: ${{ needs.check-commit.outputs.skip != 'true' }}
     outputs:
@@ -83,7 +83,7 @@ jobs:
   build-image-amd64:
     name: build-image.linux/amd64
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 20
 
     steps:
@@ -97,7 +97,7 @@ jobs:
   build-image-arm64:
     name: build-image.linux/arm64
     needs: build
-    runs-on: buildjet-4vcpu-ubuntu-2204-arm
+    runs-on: buildjet-4vcpu-ubuntu-2404-arm
     timeout-minutes: 20
 
     steps:
@@ -111,7 +111,7 @@ jobs:
   unit-tests:
     name: unit.${{ matrix.index }}
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix: ${{fromJson(needs.build.outputs.matrix)}}
@@ -151,7 +151,7 @@ jobs:
   docker-deploy-tests:
     name: docker
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
 
@@ -181,7 +181,7 @@ jobs:
   go-tests:
     name: go.${{ matrix.index }}
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -222,7 +222,7 @@ jobs:
   publish-test-results:
     name: publish-test-results
     needs: unit-tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       checks: write
     # the build-and-test job might be skipped, we don't need to run this job then
diff --git a/tests.mk b/tests.mk
index bee1c5ad1..df4fdeb81 100644
--- a/tests.mk
+++ b/tests.mk
@@ -86,7 +86,11 @@ ifneq ($(wildcard /etc/ssh/sshd_config),)
 ifeq ($(shell grep 22333 /etc/ssh/sshd_config),)
 	sed --in-place "s:^Port 22:Port 22 \\nPort 22333:g" /etc/ssh/sshd_config
 endif
-	service ssh restart
+ifeq ($(shell grep 22333 /usr/lib/systemd/system/ssh.socket),)
+	sed --in-place "s:^ListenStream=22:ListenStream=22 \\nListenStream=22333:g" /usr/lib/systemd/system/ssh.socket
+endif
+	systemctl daemon-reload
+	systemctl restart ssh.socket
 endif
 
 	@echo "-----> Installing SSH public key..."
@@ -116,9 +120,9 @@ endif
 prime-ssh-known-hosts:
 	@echo "-----> Intitial SSH connection to populate known_hosts..."
 	@echo "=====> SSH $(DOKKU_DOMAIN)"
-	ssh -o StrictHostKeyChecking=no dokku@$(DOKKU_DOMAIN) help >/dev/null
+	ssh -o StrictHostKeyChecking=no dokku@$(DOKKU_DOMAIN) help
 	@echo "=====> SSH 127.0.0.1"
-	ssh -o StrictHostKeyChecking=no dokku@127.0.0.1 help >/dev/null
+	ssh -o StrictHostKeyChecking=no dokku@127.0.0.1 help
 
 lint-setup:
 	@mkdir -p test-results/shellcheck tmp/shellcheck
diff --git a/tests/ci/setup.sh b/tests/ci/setup.sh
index 6a7fd1b34..1cb1d4e80 100755
--- a/tests/ci/setup.sh
+++ b/tests/ci/setup.sh
@@ -111,7 +111,7 @@ EOF
 
   sleep 5
   echo "-----> Start install ${ROOT_DIR}/build/package/dokku-${architecture}.deb via dpkg"
-  sudo TRACE=1 dpkg -i "${ROOT_DIR}/build/package/dokku-${architecture}.deb"
+  sudo dpkg -i "${ROOT_DIR}/build/package/dokku-${architecture}.deb"
   echo "-----> End install ${ROOT_DIR}/build/package/dokku-${architecture}.deb via dpkg"
 }