diff --git a/root/ppg/staging/15/macros.yaml b/root/ppg/staging/15/macros.yaml
index af829425..01fa878d 100644
--- a/root/ppg/staging/15/macros.yaml
+++ b/root/ppg/staging/15/macros.yaml
@@ -3,4 +3,4 @@
 - PG_MINOR_VERSION: 18
 - PG_PREV_MINOR_VERSION: 17
 - PG_VERSION: %!{PG_MAJOR_VERSION}.%!{PG_MINOR_VERSION}
-- PGAUDIT_VERSION: 1.6.3
+- PGAUDIT_VERSION: 1.7.1
diff --git a/root/ppg/staging/15/percona-pgaudit/rpm/percona-pgaudit14-rpmlintrc b/root/ppg/staging/15/percona-pgaudit/rpm/percona-pgaudit15-rpmlintrc
similarity index 100%
rename from root/ppg/staging/15/percona-pgaudit/rpm/percona-pgaudit14-rpmlintrc
rename to root/ppg/staging/15/percona-pgaudit/rpm/percona-pgaudit15-rpmlintrc
diff --git a/root/ppg/staging/15/percona-pgaudit/rpm/percona-pgaudit14.spec b/root/ppg/staging/15/percona-pgaudit/rpm/percona-pgaudit15.spec
similarity index 100%
rename from root/ppg/staging/15/percona-pgaudit/rpm/percona-pgaudit14.spec
rename to root/ppg/staging/15/percona-pgaudit/rpm/percona-pgaudit15.spec
diff --git a/root/ppg/staging/17/macros.yaml b/root/ppg/staging/17/macros.yaml
index ca7a2884..22ff3057 100644
--- a/root/ppg/staging/17/macros.yaml
+++ b/root/ppg/staging/17/macros.yaml
@@ -3,4 +3,5 @@
 - PG_MINOR_VERSION: 10
 - PG_PREV_MINOR_VERSION: 9
 - PG_VERSION: %!{PG_MAJOR_VERSION}.%!{PG_MINOR_VERSION}
+- PERCONA_PG_PATCH_VERSION: 2
 - PGAUDIT_VERSION: 17.1
diff --git a/root/ppg/staging/17/percona-postgresql/obs/_service b/root/ppg/staging/17/percona-postgresql/obs/_service
index 4233af67..00b48570 100644
--- a/root/ppg/staging/17/percona-postgresql/obs/_service
+++ b/root/ppg/staging/17/percona-postgresql/obs/_service
@@ -1,8 +1,8 @@
 <services>
   <service name="obs_scm">
-    <param name="url">https://github.com/Percona-Lab/postgres.git</param>
+    <param name="url">https://github.com/percona/postgres.git</param>
     <param name="scm">git</param>
-    <param name="revision">release-%!{PG_VERSION}.1</param>
+    <param name="revision">release-%!{PG_VERSION}.%!{PERCONA_PG_PATCH_VERSION}</param>
     <param name="version">%!{PG_VERSION}</param>
     <param name="filename">percona-postgresql</param>
   </service>
diff --git a/root/ppg/staging/18/macros.yaml b/root/ppg/staging/18/macros.yaml
index bc51e81f..3a0bae14 100644
--- a/root/ppg/staging/18/macros.yaml
+++ b/root/ppg/staging/18/macros.yaml
@@ -3,4 +3,5 @@
 - PG_MINOR_VERSION: 4
 - PG_PREV_MINOR_VERSION: 3
 - PG_VERSION: %!{PG_MAJOR_VERSION}.%!{PG_MINOR_VERSION}
+- PERCONA_PG_PATCH_VERSION: 2
 - PGAUDIT_VERSION: 18.0
diff --git a/root/ppg/staging/18/percona-postgresql/obs/_service b/root/ppg/staging/18/percona-postgresql/obs/_service
index 6607509c..63ce7cb4 100644
--- a/root/ppg/staging/18/percona-postgresql/obs/_service
+++ b/root/ppg/staging/18/percona-postgresql/obs/_service
@@ -1,8 +1,8 @@
 <services>
   <service name="obs_scm">
-    <param name="url">https://github.com/Percona-Lab/postgres.git</param>
+    <param name="url">https://github.com/percona/postgres.git</param>
     <param name="scm">git</param>
-    <param name="revision">release-%!{PG_VERSION}.1</param>
+    <param name="revision">release-%!{PG_VERSION}.%!{PERCONA_PG_PATCH_VERSION}</param>
     <param name="version">%!{PG_VERSION}</param>
     <param name="filename">percona-postgresql</param>
   </service>
diff --git a/root/ppg/staging/macros.yaml b/root/ppg/staging/macros.yaml
index 6872b9f6..981e4c4d 100644
--- a/root/ppg/staging/macros.yaml
+++ b/root/ppg/staging/macros.yaml
@@ -11,8 +11,8 @@
 - PGBADGER_VERSION: 13.2
 - PGBOUNCER_TAG: pgbouncer_1_25_2
 - PGBOUNCER_VERSION: 1.25.2
-- PGPOOL_TAG: V4_7_1
-- PGPOOL_VERSION: 4.7.1
+- PGPOOL_TAG: V4_7_2
+- PGPOOL_VERSION: 4.7.2
 - PGVECTOR_VERSION: 0.8.3
 - PG_CRON_VERSION: 1.6.7
 - PG_GATHER_VERSION: 33