diff --git a/roles/init_dbserver/tasks/rm_initdb.yml b/roles/init_dbserver/tasks/rm_initdb.yml
index c5dadad74..fcdee902b 100644
--- a/roles/init_dbserver/tasks/rm_initdb.yml
+++ b/roles/init_dbserver/tasks/rm_initdb.yml
@@ -44,8 +44,8 @@
     state: absent
   become: true
   when:
-    - force_rm_data is defined
-    - force_rm_data
+    - force_rm_pg_data is defined
+    - force_rm_pg_data
 
 - name: Remove postgres log directory if exists
   ansible.builtin.file:
@@ -61,8 +61,8 @@
   become: true
   when:
     - pg_wal|length > 0
-    - force_rm_wal is defined
-    - force_rm_wal
+    - force_rm_pg_wal is defined
+    - force_rm_pg_wal
 
 - name: Remove postgres local wal archive directory if exists
   ansible.builtin.file:
diff --git a/roles/setup_replication/tasks/rm_replication.yml b/roles/setup_replication/tasks/rm_replication.yml
index 2e49866f2..eec184dd4 100644
--- a/roles/setup_replication/tasks/rm_replication.yml
+++ b/roles/setup_replication/tasks/rm_replication.yml
@@ -53,8 +53,8 @@
     path: "{{ pg_data }}"
     state: absent
   when:
-    - force_rm_data is defined
-    - force_rm_data
+    - force_rm_pg_data is defined
+    - force_rm_pg_data
   become: true
 
 - name: Remove Postgres log directory if exists
@@ -71,8 +71,8 @@
   become: true
   when:
     - pg_wal|length > 0
-    - force_rm_wal is defined
-    - force_rm_wal
+    - force_rm_pg_wal is defined
+    - force_rm_pg_wal
 
 - name: Remove postgres default data directory if exists
   ansible.builtin.file: