diff --git a/packagelists/amd64/pg16.13-spock5.0.6-minimal.txt b/packagelists/amd64/pg16.13-spock5.0.6-minimal.txt
deleted file mode 100644
index 2334d5a..0000000
--- a/packagelists/amd64/pg16.13-spock5.0.6-minimal.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-pgedge-postgresql16-16.13-1.el9
-pgedge-spock50_16-5.0.6-1.el9
-pgedge-snowflake_16-2.4-1.el9
-pgedge-lolor_16-1.2.2-1.el9
diff --git a/packagelists/amd64/pg16.14-spock5.0.8-minimal.txt b/packagelists/amd64/pg16.14-spock5.0.8-minimal.txt
new file mode 100644
index 0000000..037f8ae
--- /dev/null
+++ b/packagelists/amd64/pg16.14-spock5.0.8-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql16-16.14-1.el9
+pgedge-spock50_16-5.0.8-1.el9
+pgedge-snowflake_16-2.4-1.el9
+pgedge-lolor_16-1.2.2-1.el9
diff --git a/packagelists/amd64/pg16.13-spock5.0.6-standard.txt b/packagelists/amd64/pg16.14-spock5.0.8-standard.txt
similarity index 88%
rename from packagelists/amd64/pg16.13-spock5.0.6-standard.txt
rename to packagelists/amd64/pg16.14-spock5.0.8-standard.txt
index 79466cc..3b724e5 100644
--- a/packagelists/amd64/pg16.13-spock5.0.6-standard.txt
+++ b/packagelists/amd64/pg16.14-spock5.0.8-standard.txt
@@ -1,5 +1,5 @@
-pgedge-postgresql16-16.13-1.el9
-pgedge-spock50_16-5.0.6-1.el9
+pgedge-postgresql16-16.14-1.el9
+pgedge-spock50_16-5.0.8-1.el9
 pgedge-snowflake_16-2.4-1.el9
 pgedge-lolor_16-1.2.2-1.el9
 pgedge-pgaudit_16-16.1-1.el9
diff --git a/packagelists/amd64/pg17.10-spock5.0.8-minimal.txt b/packagelists/amd64/pg17.10-spock5.0.8-minimal.txt
new file mode 100644
index 0000000..a8478c5
--- /dev/null
+++ b/packagelists/amd64/pg17.10-spock5.0.8-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql17-17.10-1.el9
+pgedge-spock50_17-5.0.8-1.el9
+pgedge-snowflake_17-2.4-1.el9
+pgedge-lolor_17-1.2.2-1.el9
diff --git a/packagelists/arm64/pg17.9-spock5.0.6-standard.txt b/packagelists/amd64/pg17.10-spock5.0.8-standard.txt
similarity index 88%
rename from packagelists/arm64/pg17.9-spock5.0.6-standard.txt
rename to packagelists/amd64/pg17.10-spock5.0.8-standard.txt
index 38156f3..23a42a4 100644
--- a/packagelists/arm64/pg17.9-spock5.0.6-standard.txt
+++ b/packagelists/amd64/pg17.10-spock5.0.8-standard.txt
@@ -1,5 +1,5 @@
-pgedge-postgresql17-17.9-1.el9
-pgedge-spock50_17-5.0.6-1.el9
+pgedge-postgresql17-17.10-1.el9
+pgedge-spock50_17-5.0.8-1.el9
 pgedge-snowflake_17-2.4-1.el9
 pgedge-lolor_17-1.2.2-1.el9
 pgedge-pgaudit_17-17.1-1.el9
diff --git a/packagelists/amd64/pg17.9-spock5.0.6-minimal.txt b/packagelists/amd64/pg17.9-spock5.0.6-minimal.txt
deleted file mode 100644
index 7a35cf5..0000000
--- a/packagelists/amd64/pg17.9-spock5.0.6-minimal.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-pgedge-postgresql17-17.9-1.el9
-pgedge-spock50_17-5.0.6-1.el9
-pgedge-snowflake_17-2.4-1.el9
-pgedge-lolor_17-1.2.2-1.el9
diff --git a/packagelists/amd64/pg18.3-spock5.0.6-minimal.txt b/packagelists/amd64/pg18.3-spock5.0.6-minimal.txt
deleted file mode 100644
index d5a890c..0000000
--- a/packagelists/amd64/pg18.3-spock5.0.6-minimal.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-pgedge-postgresql18-18.3-1.el9
-pgedge-spock50_18-5.0.6-1.el9
-pgedge-snowflake_18-2.4-1.el9
-pgedge-lolor_18-1.2.2-1.el9
diff --git a/packagelists/amd64/pg18.4-spock5.0.8-minimal.txt b/packagelists/amd64/pg18.4-spock5.0.8-minimal.txt
new file mode 100644
index 0000000..148a158
--- /dev/null
+++ b/packagelists/amd64/pg18.4-spock5.0.8-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql18-18.4-1.el9
+pgedge-spock50_18-5.0.8-1.el9
+pgedge-snowflake_18-2.4-1.el9
+pgedge-lolor_18-1.2.2-1.el9
diff --git a/packagelists/amd64/pg18.3-spock5.0.6-standard.txt b/packagelists/amd64/pg18.4-spock5.0.8-standard.txt
similarity index 88%
rename from packagelists/amd64/pg18.3-spock5.0.6-standard.txt
rename to packagelists/amd64/pg18.4-spock5.0.8-standard.txt
index be69508..b1f7fcc 100644
--- a/packagelists/amd64/pg18.3-spock5.0.6-standard.txt
+++ b/packagelists/amd64/pg18.4-spock5.0.8-standard.txt
@@ -1,5 +1,5 @@
-pgedge-postgresql18-18.3-1.el9
-pgedge-spock50_18-5.0.6-1.el9
+pgedge-postgresql18-18.4-1.el9
+pgedge-spock50_18-5.0.8-1.el9
 pgedge-snowflake_18-2.4-1.el9
 pgedge-lolor_18-1.2.2-1.el9
 pgedge-pgaudit_18-18.0-1.el9
diff --git a/packagelists/arm64/pg16.13-spock5.0.6-minimal.txt b/packagelists/arm64/pg16.13-spock5.0.6-minimal.txt
deleted file mode 100644
index 2334d5a..0000000
--- a/packagelists/arm64/pg16.13-spock5.0.6-minimal.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-pgedge-postgresql16-16.13-1.el9
-pgedge-spock50_16-5.0.6-1.el9
-pgedge-snowflake_16-2.4-1.el9
-pgedge-lolor_16-1.2.2-1.el9
diff --git a/packagelists/arm64/pg16.14-spock5.0.8-minimal.txt b/packagelists/arm64/pg16.14-spock5.0.8-minimal.txt
new file mode 100644
index 0000000..037f8ae
--- /dev/null
+++ b/packagelists/arm64/pg16.14-spock5.0.8-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql16-16.14-1.el9
+pgedge-spock50_16-5.0.8-1.el9
+pgedge-snowflake_16-2.4-1.el9
+pgedge-lolor_16-1.2.2-1.el9
diff --git a/packagelists/arm64/pg16.13-spock5.0.6-standard.txt b/packagelists/arm64/pg16.14-spock5.0.8-standard.txt
similarity index 88%
rename from packagelists/arm64/pg16.13-spock5.0.6-standard.txt
rename to packagelists/arm64/pg16.14-spock5.0.8-standard.txt
index 79466cc..3b724e5 100644
--- a/packagelists/arm64/pg16.13-spock5.0.6-standard.txt
+++ b/packagelists/arm64/pg16.14-spock5.0.8-standard.txt
@@ -1,5 +1,5 @@
-pgedge-postgresql16-16.13-1.el9
-pgedge-spock50_16-5.0.6-1.el9
+pgedge-postgresql16-16.14-1.el9
+pgedge-spock50_16-5.0.8-1.el9
 pgedge-snowflake_16-2.4-1.el9
 pgedge-lolor_16-1.2.2-1.el9
 pgedge-pgaudit_16-16.1-1.el9
diff --git a/packagelists/arm64/pg17.10-spock5.0.8-minimal.txt b/packagelists/arm64/pg17.10-spock5.0.8-minimal.txt
new file mode 100644
index 0000000..a8478c5
--- /dev/null
+++ b/packagelists/arm64/pg17.10-spock5.0.8-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql17-17.10-1.el9
+pgedge-spock50_17-5.0.8-1.el9
+pgedge-snowflake_17-2.4-1.el9
+pgedge-lolor_17-1.2.2-1.el9
diff --git a/packagelists/amd64/pg17.9-spock5.0.6-standard.txt b/packagelists/arm64/pg17.10-spock5.0.8-standard.txt
similarity index 88%
rename from packagelists/amd64/pg17.9-spock5.0.6-standard.txt
rename to packagelists/arm64/pg17.10-spock5.0.8-standard.txt
index 38156f3..23a42a4 100644
--- a/packagelists/amd64/pg17.9-spock5.0.6-standard.txt
+++ b/packagelists/arm64/pg17.10-spock5.0.8-standard.txt
@@ -1,5 +1,5 @@
-pgedge-postgresql17-17.9-1.el9
-pgedge-spock50_17-5.0.6-1.el9
+pgedge-postgresql17-17.10-1.el9
+pgedge-spock50_17-5.0.8-1.el9
 pgedge-snowflake_17-2.4-1.el9
 pgedge-lolor_17-1.2.2-1.el9
 pgedge-pgaudit_17-17.1-1.el9
diff --git a/packagelists/arm64/pg17.9-spock5.0.6-minimal.txt b/packagelists/arm64/pg17.9-spock5.0.6-minimal.txt
deleted file mode 100644
index 7a35cf5..0000000
--- a/packagelists/arm64/pg17.9-spock5.0.6-minimal.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-pgedge-postgresql17-17.9-1.el9
-pgedge-spock50_17-5.0.6-1.el9
-pgedge-snowflake_17-2.4-1.el9
-pgedge-lolor_17-1.2.2-1.el9
diff --git a/packagelists/arm64/pg18.3-spock5.0.6-minimal.txt b/packagelists/arm64/pg18.3-spock5.0.6-minimal.txt
deleted file mode 100644
index d5a890c..0000000
--- a/packagelists/arm64/pg18.3-spock5.0.6-minimal.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-pgedge-postgresql18-18.3-1.el9
-pgedge-spock50_18-5.0.6-1.el9
-pgedge-snowflake_18-2.4-1.el9
-pgedge-lolor_18-1.2.2-1.el9
diff --git a/packagelists/arm64/pg18.4-spock5.0.8-minimal.txt b/packagelists/arm64/pg18.4-spock5.0.8-minimal.txt
new file mode 100644
index 0000000..148a158
--- /dev/null
+++ b/packagelists/arm64/pg18.4-spock5.0.8-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql18-18.4-1.el9
+pgedge-spock50_18-5.0.8-1.el9
+pgedge-snowflake_18-2.4-1.el9
+pgedge-lolor_18-1.2.2-1.el9
diff --git a/packagelists/arm64/pg18.3-spock5.0.6-standard.txt b/packagelists/arm64/pg18.4-spock5.0.8-standard.txt
similarity index 88%
rename from packagelists/arm64/pg18.3-spock5.0.6-standard.txt
rename to packagelists/arm64/pg18.4-spock5.0.8-standard.txt
index be69508..b1f7fcc 100644
--- a/packagelists/arm64/pg18.3-spock5.0.6-standard.txt
+++ b/packagelists/arm64/pg18.4-spock5.0.8-standard.txt
@@ -1,5 +1,5 @@
-pgedge-postgresql18-18.3-1.el9
-pgedge-spock50_18-5.0.6-1.el9
+pgedge-postgresql18-18.4-1.el9
+pgedge-spock50_18-5.0.8-1.el9
 pgedge-snowflake_18-2.4-1.el9
 pgedge-lolor_18-1.2.2-1.el9
 pgedge-pgaudit_18-18.0-1.el9
diff --git a/scripts/build_pgedge_images.py b/scripts/build_pgedge_images.py
index 6ceb2e7..871fb6a 100755
--- a/scripts/build_pgedge_images.py
+++ b/scripts/build_pgedge_images.py
@@ -161,27 +161,30 @@ def make_all_flavor_images(
 all_images: list[PgEdgeImage] = [
     # pg16 images
     *make_all_flavor_images(
-        postgres_version="16.13",
-        spock_version="5.0.6",
-        epoch=2,
+        postgres_version="16.14",
+        spock_version="5.0.8",
+        epoch=1,
         is_latest_for_pg_major=True,
         is_latest_for_spock_major=True,
+        package_release_channel="staging",
     ),
     # pg17 images
     *make_all_flavor_images(
-        postgres_version="17.9",
-        spock_version="5.0.6",
-        epoch=2,
+        postgres_version="17.10",
+        spock_version="5.0.8",
+        epoch=1,
         is_latest_for_pg_major=True,
         is_latest_for_spock_major=True,
+        package_release_channel="staging",
     ),
     # pg18 images
     *make_all_flavor_images(
-        postgres_version="18.3",
-        spock_version="5.0.6",
-        epoch=2,
+        postgres_version="18.4",
+        spock_version="5.0.8",
+        epoch=1,
         is_latest_for_pg_major=True,
         is_latest_for_spock_major=True,
+        package_release_channel="staging",
     ),
 ]