diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 17e49a1..8728090 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,12 +11,12 @@ jobs:
       PGUSER: postgres
     strategy:
       matrix:
-        postgresql_version: [11, 12, 13, 14, 15]
+        postgresql_version: [11, 12, 13, 14, 15, 16]
         experimental: [false]
         repo: ["pgdg"]
         # Define the current dev version to be experimental
         include:
-          - postgresql_version: 16
+          - postgresql_version: 17
             experimental: true
             repo: "pgdg-snapshot"
     steps:
diff --git a/Makefile b/Makefile
index a3831e2..ce6a815 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ EXTRA_CLEAN = aiven_extras.control aiven-extras-rpm-src.tar
 
 include $(PGXS)
 
-rpm: rpm-96 rpm-10 rpm-11 rpm-12 rpm-13 rpm-14 rpm-15
+rpm: rpm-96 rpm-10 rpm-11 rpm-12 rpm-13 rpm-14 rpm-15 rpm-16
 
 aiven_extras.control: aiven_extras.control.in
 	mkdir -p $(@D)