diff --git a/.github/workflows/apt-arm-packages.yaml b/.github/workflows/apt-arm-packages.yaml
index 6b04af882f3..2058e2071f5 100644
--- a/.github/workflows/apt-arm-packages.yaml
+++ b/.github/workflows/apt-arm-packages.yaml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         image: [ "debian:11-slim", "debian:12-slim", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04" ]
-        pg: [ 14, 15, 16 ]
+        pg: [ 14, 15, 16, 17 ]
 
     steps:
     - name: Setup emulation
diff --git a/.github/workflows/apt-packages.yaml b/.github/workflows/apt-packages.yaml
index 536ee13e280..eb118f791b2 100644
--- a/.github/workflows/apt-packages.yaml
+++ b/.github/workflows/apt-packages.yaml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         image: [ "debian:11-slim", "debian:12-slim", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04" ]
-        pg: [ 14, 15, 16 ]
+        pg: [ 14, 15, 16, 17 ]
         license: [ "TSL", "Apache"]
         include:
           - license: Apache
@@ -84,7 +84,7 @@ jobs:
         fi
 
     - name: Test Downgrade
-      if: matrix.image != 'ubuntu:24.04'
+      if: matrix.pg != '17'
       run: |
         # Since this runs nightly on main we have to get the previous version
         # from the last released version and not current branch.
diff --git a/.github/workflows/rpm-packages.yaml b/.github/workflows/rpm-packages.yaml
index aaf844f10da..560719b2fe5 100644
--- a/.github/workflows/rpm-packages.yaml
+++ b/.github/workflows/rpm-packages.yaml
@@ -4,6 +4,8 @@ name: RPM packages
   schedule:
     # run daily 0:00 on main branch
     - cron: '0 0 * * *'
+  pull_request:
+    paths: .github/workflows/rpm-packages.yaml
   push:
     tags:
     - '*'
@@ -21,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         image: [ "rockylinux:8", "rockylinux:9" ]
-        pg: [ 14, 15, 16 ]
+        pg: [ 14, 15, 16, 17 ]
         license: [ "TSL", "Apache"]
         include:
           - license: Apache
@@ -90,6 +92,7 @@ jobs:
         fi
 
     - name: Test Downgrade
+      if: matrix.pg != '17'
       run: |
         # Since this runs nightly on main we have to get the previous version
         # from the last released version and not current branch.