diff --git a/defaults/main.yaml b/defaults/main.yaml
index 77d2e64..513f20d 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -1,5 +1,5 @@
 # Patroni common options
-patroni_version: "3.2.2"
+patroni_version: "3.3.0"
 patroni_install_official_repo: true
 patroni_play_group: "patroni"
 patroni_user: "postgres"
@@ -10,7 +10,7 @@ patroni_cluster_name: "patroni-cluster"
 patroni_namespace: "/service/"
 
 # Patroni PostgreSQL common options
-patroni_postgresql_version: "16.2"
+patroni_postgresql_version: "16.3"
 patroni_postgresql_install_repo: true
 patroni_postgresql_system_locale: "en_US.UTF-8"
 patroni_postgresql_system_language: "{{ patroni_postgresql_system_locale }}"
@@ -54,12 +54,12 @@ patroni_wal_g_pg_binary_name: 'wal-g-pg'
 patroni_wal_g_config_name: ".walg.json"
 patroni_wal_g_restore_config_name: ".walg-restore.json"
 patroni_restore_script: "{{ patroni_postgresql_home_dir }}/restore.sh"
-patroni_postgresql_archive_command: "wal-g wal-push %p"
-patroni_postgresql_restore_command: "wal-g wal-fetch %f %p"
-patroni_cluster_bootstrap_command: "wal-g backup-fetch LATEST"
-patroni_cluster_restore_bootstrap_command: "wal-g backup-fetch {{ patroni_wal_g_restore_backup_name }}"
+patroni_postgresql_archive_command: "wal-g-pg wal-push %p"
+patroni_postgresql_restore_command: "wal-g-pg wal-fetch %f %p"
+patroni_cluster_bootstrap_command: "wal-g-pg backup-fetch LATEST"
+patroni_cluster_restore_bootstrap_command: "wal-g-pg backup-fetch {{ patroni_wal_g_restore_backup_name }}"
 # "restore_command" written to recovery.conf when configuring follower (create replica)
-patroni_cluster_restore_command: "wal-g wal-fetch %f %p"
+patroni_cluster_restore_command: "wal-g-pg wal-fetch %f %p"
 patroni_wal_g_create_replica_methods:
   - {option: "command", value: "{{ patroni_cluster_bootstrap_command }}"}
   - {option: "no_params", value: "True"}
@@ -189,7 +189,7 @@ patroni_postgresql_default_parameters:
   wal_receiver_status_interval: "10s"
   idle_in_transaction_session_timeout: "10min"
   jit: "off"
-#  archive_command: 'wal-g wal-push %p'
+#  archive_command: 'wal-g-pg wal-push %p'
 #  archive_command: 'pgbackrest --stanza={{ pgbackrest_stanza }} archive-push %p'
 #  max_worker_processes: '24'
 #  max_parallel_workers: '12'
diff --git a/tasks/Debian/wal_g_install.yaml b/tasks/Debian/wal_g_install.yaml
index 5e9ff6e..b57a71d 100644
--- a/tasks/Debian/wal_g_install.yaml
+++ b/tasks/Debian/wal_g_install.yaml
@@ -5,7 +5,7 @@
 
 - name: Include WAL-G role
   ansible.builtin.include_role:
-    name: wal-g
+    name: wal-g-pg
   vars:
     wal_g_pg: yes
   when: patroni_wal_g_install
diff --git a/tasks/RedHat/wal_g_install.yaml b/tasks/RedHat/wal_g_install.yaml
index 5e9ff6e..b57a71d 100644
--- a/tasks/RedHat/wal_g_install.yaml
+++ b/tasks/RedHat/wal_g_install.yaml
@@ -5,7 +5,7 @@
 
 - name: Include WAL-G role
   ansible.builtin.include_role:
-    name: wal-g
+    name: wal-g-pg
   vars:
     wal_g_pg: yes
   when: patroni_wal_g_install
diff --git a/vars/Debian-11.yaml b/vars/Debian-11.yaml
index d38e8dd..5fdd007 100644
--- a/vars/Debian-11.yaml
+++ b/vars/Debian-11.yaml
@@ -16,7 +16,7 @@ patroni_deps_packages:
 # Patroni variables
 patroni_package_name: "patroni"
 patroni_package: "{{ patroni_package_name }}={{ patroni_version }}-{{ patroni_version_build }}"
-patroni_version_build: "2.pgdg{{ ansible_distribution_version}}0+1"
+patroni_version_build: "1.pgdg{{ ansible_distribution_version}}0+1"
 patroni_unit_name: "patroni"
 patroni_config_name: "config.yml"
 
diff --git a/vars/Debian-12.yaml b/vars/Debian-12.yaml
index d38e8dd..5fdd007 100644
--- a/vars/Debian-12.yaml
+++ b/vars/Debian-12.yaml
@@ -16,7 +16,7 @@ patroni_deps_packages:
 # Patroni variables
 patroni_package_name: "patroni"
 patroni_package: "{{ patroni_package_name }}={{ patroni_version }}-{{ patroni_version_build }}"
-patroni_version_build: "2.pgdg{{ ansible_distribution_version}}0+1"
+patroni_version_build: "1.pgdg{{ ansible_distribution_version}}0+1"
 patroni_unit_name: "patroni"
 patroni_config_name: "config.yml"
 
diff --git a/vars/Ubuntu-20.04.yaml b/vars/Ubuntu-20.04.yaml
index 5403c4b..659e832 100644
--- a/vars/Ubuntu-20.04.yaml
+++ b/vars/Ubuntu-20.04.yaml
@@ -16,7 +16,7 @@ patroni_deps_packages:
 # Patroni variables
 patroni_package_name: "patroni"
 patroni_package: "{{ patroni_package_name }}={{ patroni_version }}-{{ patroni_version_build }}"
-patroni_version_build: "2.pgdg{{ ansible_distribution_version}}+1"
+patroni_version_build: "1.pgdg{{ ansible_distribution_version}}+1"
 patroni_unit_name: "patroni"
 patroni_config_name: "config.yml"
 
diff --git a/vars/Ubuntu-22.04.yaml b/vars/Ubuntu-22.04.yaml
index 5403c4b..659e832 100644
--- a/vars/Ubuntu-22.04.yaml
+++ b/vars/Ubuntu-22.04.yaml
@@ -16,7 +16,7 @@ patroni_deps_packages:
 # Patroni variables
 patroni_package_name: "patroni"
 patroni_package: "{{ patroni_package_name }}={{ patroni_version }}-{{ patroni_version_build }}"
-patroni_version_build: "2.pgdg{{ ansible_distribution_version}}+1"
+patroni_version_build: "1.pgdg{{ ansible_distribution_version}}+1"
 patroni_unit_name: "patroni"
 patroni_config_name: "config.yml"