diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
index aa99423..510bb7e 100644
--- a/.github/workflows/build-package.yml
+++ b/.github/workflows/build-package.yml
@@ -24,8 +24,8 @@ jobs:
       matrix:
         os:
           - ubuntu-20.04
-          # # Disable jammy
-          # - ubuntu-22.04
+          - ubuntu-22.04
+          - ubuntu-24.04
         cc:
           - gcc
           # # Disable Clang (enable required: matrix.include.cc: clang)
@@ -48,7 +48,7 @@ jobs:
       CFLAGS: ${{ matrix.CFLAGS }}
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Fetch update package information
         run: sudo apt-get update --assume-yes
@@ -69,9 +69,9 @@ jobs:
         run: make package-deb
 
       - name: Upload package(s)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: Packages
+          name: Packages-${{ matrix.os }}
           path: |
             schaufel_*.buildinfo
             schaufel_*.changes
diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
index 90fb1a0..04ec8c6 100644
--- a/.github/workflows/test-pr.yml
+++ b/.github/workflows/test-pr.yml
@@ -1,11 +1,8 @@
+---
 name: Test Schaufel
 
 # Run this workflow every time a new commit pushed to your repository
 on:
-  push:
-    #branches: '**'
-    #branches-ignore: 'main'
-
   pull_request:
     #branches: '**'
     #branches-ignore: 'main'
@@ -25,12 +22,14 @@ jobs:
     strategy:
       matrix:
         # also test 'latest', eventually this will be upgraded to a newer version and might fail early
-        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-latest]
-        #os: [ubuntu-latest]
+        os:
+          - ubuntu-20.04
+          - ubuntu-22.04
+          - ubuntu-24.04
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Versions
         run: echo "${{ matrix.os }}"
@@ -74,14 +73,14 @@ jobs:
         run: diff -q src/main.c main.c
   pr-test-freebsd:
     name: Test Schaufel on FreeBSD
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Run FreeBSD test
         id: test
-        uses: vmactions/freebsd-vm@v0
+        uses: vmactions/freebsd-vm@v1
         with:
           usesh: true
           prepare: |