diff --git a/defaults/main.yml b/defaults/main.yml
index 4a8c0c7..e2e6b01 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -27,6 +27,7 @@ pgpool_port: 5433
 pgpool_listen_backlog_multiplier: 2
 pgpool_pcp_user: admin
 pgpool_floating_ip_interface: '{{ ansible_default_ipv4.alias }}'
+pgpool_wd_hostname: '{{ ansible_default_ipv4.address }}'
 # Define pcp_pwd in a vault file
 pgpool_pcp_listen_addresses: '*'
 pgpool_pcp_port: 9898
diff --git a/templates/pgpool.conf.j2 b/templates/pgpool.conf.j2
index 65b9bf2..9009d9f 100644
--- a/templates/pgpool.conf.j2
+++ b/templates/pgpool.conf.j2
@@ -460,7 +460,7 @@ ping_path = '/bin'
 
 # - Watchdog communication Settings -
 
-wd_hostname = '{{ ansible_default_ipv4.address }}'
+wd_hostname = '{{ pgpool_wd_hostname }}'
                                     # Host name or IP address of this watchdog
                                     # (change requires restart)
 wd_port = 9000
@@ -489,7 +489,7 @@ if_down_cmd = 'ip_script addr del {{ pgpool_virtual_ip }}/{{ pgpool_virtual_netm
 arping_path = '/usr/local/bin'           # arping command path
                                     # (change requires restart)
 
-arping_cmd = 'arping_script -U $_IP_$ -w 1'
+arping_cmd = 'arping_script -U {{ pgpool_virtual_ip }} -w 1'
                                     # arping command
                                     # (change requires restart)
 
diff --git a/templates/postgresql-sudoers.j2 b/templates/postgresql-sudoers.j2
index 9726c80..ac86bec 100644
--- a/templates/postgresql-sudoers.j2
+++ b/templates/postgresql-sudoers.j2
@@ -1,3 +1,3 @@
-postgres  ALL=(ALL) NOPASSWD:   /etc/init.d/postgres*
+postgres  ALL=(ALL) NOPASSWD:   /usr/bin/arping, /bin/systemctl * postgres*