diff --git a/Dockerfile b/Dockerfile
index c6cc685..b440bf0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -110,8 +110,8 @@ set -o pipefail
 set -o nounset
 
 xargs dnf install -y < /usr/share/pgedge/packages.txt
-dnf install -y python3-pip-21.3.1-1.el9
-pip install 'patroni[etcd,jsonlogger]==4.1.0'
+dnf install -y 'python3-pip-21.3.1-*'
+pip install 'patroni[etcd,jsonlogger]==4.1.3'
 dnf remove -y python3-pip
 dnf clean all
 
diff --git a/packagelists/amd64/pg16.14-spock5.0.8-minimal.txt b/packagelists/amd64/pg16.14-spock5.0.8-minimal.txt
deleted file mode 100644
index 037f8ae..0000000
--- a/packagelists/amd64/pg16.14-spock5.0.8-minimal.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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.14-spock5.0.9-minimal.txt b/packagelists/amd64/pg16.14-spock5.0.9-minimal.txt
new file mode 100644
index 0000000..84cf3ab
--- /dev/null
+++ b/packagelists/amd64/pg16.14-spock5.0.9-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql16-16.14-2.el9
+pgedge-spock50_16-5.0.9-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-standard.txt b/packagelists/amd64/pg16.14-spock5.0.9-standard.txt
similarity index 88%
rename from packagelists/amd64/pg16.14-spock5.0.8-standard.txt
rename to packagelists/amd64/pg16.14-spock5.0.9-standard.txt
index 3b724e5..ec78b34 100644
--- a/packagelists/amd64/pg16.14-spock5.0.8-standard.txt
+++ b/packagelists/amd64/pg16.14-spock5.0.9-standard.txt
@@ -1,5 +1,5 @@
-pgedge-postgresql16-16.14-1.el9
-pgedge-spock50_16-5.0.8-1.el9
+pgedge-postgresql16-16.14-2.el9
+pgedge-spock50_16-5.0.9-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
deleted file mode 100644
index a8478c5..0000000
--- a/packagelists/amd64/pg17.10-spock5.0.8-minimal.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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.10-spock5.0.9-minimal.txt b/packagelists/amd64/pg17.10-spock5.0.9-minimal.txt
new file mode 100644
index 0000000..a1e2e3f
--- /dev/null
+++ b/packagelists/amd64/pg17.10-spock5.0.9-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql17-17.10-2.el9
+pgedge-spock50_17-5.0.9-1.el9
+pgedge-snowflake_17-2.4-1.el9
+pgedge-lolor_17-1.2.2-1.el9
diff --git a/packagelists/arm64/pg17.10-spock5.0.8-standard.txt b/packagelists/amd64/pg17.10-spock5.0.9-standard.txt
similarity index 88%
rename from packagelists/arm64/pg17.10-spock5.0.8-standard.txt
rename to packagelists/amd64/pg17.10-spock5.0.9-standard.txt
index 23a42a4..a42ef97 100644
--- a/packagelists/arm64/pg17.10-spock5.0.8-standard.txt
+++ b/packagelists/amd64/pg17.10-spock5.0.9-standard.txt
@@ -1,5 +1,5 @@
-pgedge-postgresql17-17.10-1.el9
-pgedge-spock50_17-5.0.8-1.el9
+pgedge-postgresql17-17.10-2.el9
+pgedge-spock50_17-5.0.9-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/pg18.4-spock5.0.8-minimal.txt b/packagelists/amd64/pg18.4-spock5.0.8-minimal.txt
deleted file mode 100644
index 148a158..0000000
--- a/packagelists/amd64/pg18.4-spock5.0.8-minimal.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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.4-spock5.0.9-minimal.txt b/packagelists/amd64/pg18.4-spock5.0.9-minimal.txt
new file mode 100644
index 0000000..4e590d5
--- /dev/null
+++ b/packagelists/amd64/pg18.4-spock5.0.9-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql18-18.4-2.el9
+pgedge-spock50_18-5.0.9-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-standard.txt b/packagelists/amd64/pg18.4-spock5.0.9-standard.txt
similarity index 88%
rename from packagelists/amd64/pg18.4-spock5.0.8-standard.txt
rename to packagelists/amd64/pg18.4-spock5.0.9-standard.txt
index b1f7fcc..e436c76 100644
--- a/packagelists/amd64/pg18.4-spock5.0.8-standard.txt
+++ b/packagelists/amd64/pg18.4-spock5.0.9-standard.txt
@@ -1,5 +1,5 @@
-pgedge-postgresql18-18.4-1.el9
-pgedge-spock50_18-5.0.8-1.el9
+pgedge-postgresql18-18.4-2.el9
+pgedge-spock50_18-5.0.9-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.14-spock5.0.8-minimal.txt b/packagelists/arm64/pg16.14-spock5.0.8-minimal.txt
deleted file mode 100644
index 037f8ae..0000000
--- a/packagelists/arm64/pg16.14-spock5.0.8-minimal.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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.14-spock5.0.9-minimal.txt b/packagelists/arm64/pg16.14-spock5.0.9-minimal.txt
new file mode 100644
index 0000000..84cf3ab
--- /dev/null
+++ b/packagelists/arm64/pg16.14-spock5.0.9-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql16-16.14-2.el9
+pgedge-spock50_16-5.0.9-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-standard.txt b/packagelists/arm64/pg16.14-spock5.0.9-standard.txt
similarity index 88%
rename from packagelists/arm64/pg16.14-spock5.0.8-standard.txt
rename to packagelists/arm64/pg16.14-spock5.0.9-standard.txt
index 3b724e5..ec78b34 100644
--- a/packagelists/arm64/pg16.14-spock5.0.8-standard.txt
+++ b/packagelists/arm64/pg16.14-spock5.0.9-standard.txt
@@ -1,5 +1,5 @@
-pgedge-postgresql16-16.14-1.el9
-pgedge-spock50_16-5.0.8-1.el9
+pgedge-postgresql16-16.14-2.el9
+pgedge-spock50_16-5.0.9-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
deleted file mode 100644
index a8478c5..0000000
--- a/packagelists/arm64/pg17.10-spock5.0.8-minimal.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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.10-spock5.0.9-minimal.txt b/packagelists/arm64/pg17.10-spock5.0.9-minimal.txt
new file mode 100644
index 0000000..a1e2e3f
--- /dev/null
+++ b/packagelists/arm64/pg17.10-spock5.0.9-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql17-17.10-2.el9
+pgedge-spock50_17-5.0.9-1.el9
+pgedge-snowflake_17-2.4-1.el9
+pgedge-lolor_17-1.2.2-1.el9
diff --git a/packagelists/amd64/pg17.10-spock5.0.8-standard.txt b/packagelists/arm64/pg17.10-spock5.0.9-standard.txt
similarity index 88%
rename from packagelists/amd64/pg17.10-spock5.0.8-standard.txt
rename to packagelists/arm64/pg17.10-spock5.0.9-standard.txt
index 23a42a4..a42ef97 100644
--- a/packagelists/amd64/pg17.10-spock5.0.8-standard.txt
+++ b/packagelists/arm64/pg17.10-spock5.0.9-standard.txt
@@ -1,5 +1,5 @@
-pgedge-postgresql17-17.10-1.el9
-pgedge-spock50_17-5.0.8-1.el9
+pgedge-postgresql17-17.10-2.el9
+pgedge-spock50_17-5.0.9-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/pg18.4-spock5.0.8-minimal.txt b/packagelists/arm64/pg18.4-spock5.0.8-minimal.txt
deleted file mode 100644
index 148a158..0000000
--- a/packagelists/arm64/pg18.4-spock5.0.8-minimal.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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.4-spock5.0.9-minimal.txt b/packagelists/arm64/pg18.4-spock5.0.9-minimal.txt
new file mode 100644
index 0000000..4e590d5
--- /dev/null
+++ b/packagelists/arm64/pg18.4-spock5.0.9-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql18-18.4-2.el9
+pgedge-spock50_18-5.0.9-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-standard.txt b/packagelists/arm64/pg18.4-spock5.0.9-standard.txt
similarity index 88%
rename from packagelists/arm64/pg18.4-spock5.0.8-standard.txt
rename to packagelists/arm64/pg18.4-spock5.0.9-standard.txt
index b1f7fcc..e436c76 100644
--- a/packagelists/arm64/pg18.4-spock5.0.8-standard.txt
+++ b/packagelists/arm64/pg18.4-spock5.0.9-standard.txt
@@ -1,5 +1,5 @@
-pgedge-postgresql18-18.4-1.el9
-pgedge-spock50_18-5.0.8-1.el9
+pgedge-postgresql18-18.4-2.el9
+pgedge-spock50_18-5.0.9-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 88fa60b..880e50c 100755
--- a/scripts/build_pgedge_images.py
+++ b/scripts/build_pgedge_images.py
@@ -162,7 +162,7 @@ def make_all_flavor_images(
     # pg16 images
     *make_all_flavor_images(
         postgres_version="16.14",
-        spock_version="5.0.8",
+        spock_version="5.0.9",
         epoch=1,
         is_latest_for_pg_major=True,
         is_latest_for_spock_major=True,
@@ -170,7 +170,7 @@ def make_all_flavor_images(
     # pg17 images
     *make_all_flavor_images(
         postgres_version="17.10",
-        spock_version="5.0.8",
+        spock_version="5.0.9",
         epoch=1,
         is_latest_for_pg_major=True,
         is_latest_for_spock_major=True,
@@ -178,7 +178,7 @@ def make_all_flavor_images(
     # pg18 images
     *make_all_flavor_images(
         postgres_version="18.4",
-        spock_version="5.0.8",
+        spock_version="5.0.9",
         epoch=1,
         is_latest_for_pg_major=True,
         is_latest_for_spock_major=True,