diff --git a/tasks/pg.yaml b/tasks/pg.yaml
index 3723e61..f28b267 100644
--- a/tasks/pg.yaml
+++ b/tasks/pg.yaml
@@ -93,6 +93,7 @@
         owner: "{{ wal_g_pg_config_owner }}"
         group: "{{ wal_g_pg_config_group }}"
         mode: 0644
+        backup: yes
       tags: wal-g, wal_g, wal_g_conf
 
 - name: Create wal-g restore config
@@ -109,3 +110,4 @@
         owner: "{{ wal_g_pg_config_owner }}"
         group: "{{ wal_g_pg_config_group }}"
         mode: 0644
+        backup: yes
diff --git a/vars/Debian.yaml b/vars/Debian.yaml
index 706080a..be39461 100644
--- a/vars/Debian.yaml
+++ b/vars/Debian.yaml
@@ -6,7 +6,7 @@ wal_g_pg_home_dir: "/var/lib/postgresql"
 wal_g_pg_data_dir: "{{ wal_g_pg_home_dir }}/{{ wal_g_pg_major_version }}/{{ wal_g_pg_cluster_name }}"
 wal_g_pg_cluster_name: "main"
 
-wal_g_postgresql_package_name_regex: 'postgresql-.[{{ wal_g_postgresql_supported_versions | join(",") }}]'
+wal_g_postgresql_package_name_regex: 'postgres.*[{{ wal_g_postgresql_supported_versions | join(",") }}]'
 
 wal_g_package_name: "wal-g"
 wal_g_package: "{{ wal_g_package_name }}={{ wal_g_version }}-{{ wal_g_version_build }}"
diff --git a/vars/RedHat.yaml b/vars/RedHat.yaml
index 51b3163..5e744b2 100644
--- a/vars/RedHat.yaml
+++ b/vars/RedHat.yaml
@@ -8,7 +8,7 @@ wal_g_rpm_repository:
 wal_g_pg_home_dir: "/var/lib/pgsql"
 wal_g_pg_data_dir: "{{ wal_g_pg_home_dir }}/{{ wal_g_pg_major_version }}/data"
 
-wal_g_postgresql_package_name_regex: 'postgresql.[{{ wal_g_postgresql_supported_versions | join(",") }}]-server'
+wal_g_postgresql_package_name_regex: 'postgres.*[{{ wal_g_postgresql_supported_versions | join(",") }}]-server'
 
 wal_g_package_name: "wal-g"
 wal_g_package: "{{ wal_g_package_name }}-{{ wal_g_version }}"