diff --git a/roles/setup_pgpool2/tasks/pgpool2_install.yml b/roles/setup_pgpool2/tasks/pgpool2_install.yml
index 613afcbe0..9ad828cf0 100644
--- a/roles/setup_pgpool2/tasks/pgpool2_install.yml
+++ b/roles/setup_pgpool2/tasks/pgpool2_install.yml
@@ -16,7 +16,7 @@
     name: "openssl"
   when:
     - os in ['CentOS7', 'RHEL7']
-    - pgpool2_ssl is true
+    - pgpool2_ssl
   become: yes
 
 - name: Install openssl package on CentOS8 or RHEL8
@@ -24,5 +24,5 @@
     name: "openssl"
   when:
     - os in ['CentOS8', 'RHEL8']
-    - pgpool2_ssl is true
+    - pgpool2_ssl
   become: yes
diff --git a/roles/setup_pgpool2/tasks/pgpool2_setup.yml b/roles/setup_pgpool2/tasks/pgpool2_setup.yml
index 47ce6f928..6dc0fe5f0 100644
--- a/roles/setup_pgpool2/tasks/pgpool2_setup.yml
+++ b/roles/setup_pgpool2/tasks/pgpool2_setup.yml
@@ -53,7 +53,7 @@
     - ansible_facts.services['firewalld.service'].state == 'running'
     - ansible_facts.services['firewalld.service'].status == 'enabled'
     - pgpool2_wd_port is defined
-    - pgpool2_watchdog is true
+    - pgpool2_watchdog
   become: yes
 
 - name: Open Watchdog UDP port {{ pgpool2_wd_port | default('') }}
@@ -67,7 +67,7 @@
     - ansible_facts.services['firewalld.service'].state == 'running'
     - ansible_facts.services['firewalld.service'].status == 'enabled'
     - pgpool2_wd_port is defined
-    - pgpool2_watchdog is true
+    - pgpool2_watchdog
   become: yes
 
 - name: Open Watchdog heartbeat TCP port {{ pgpool2_wd_heartbeat_port | default('') }}
@@ -81,7 +81,7 @@
     - ansible_facts.services['firewalld.service'].state == 'running'
     - ansible_facts.services['firewalld.service'].status == 'enabled'
     - pgpool2_wd_heartbeat_port is defined
-    - pgpool2_watchdog is true
+    - pgpool2_watchdog
   become: yes
 
 - name: Open Watchdog heartbeat UDP port {{ pgpool2_wd_heartbeat_port | default('') }}
@@ -95,7 +95,7 @@
     - ansible_facts.services['firewalld.service'].state == 'running'
     - ansible_facts.services['firewalld.service'].status == 'enabled'
     - pgpool2_wd_heartbeat_port is defined
-    - pgpool2_watchdog is true
+    - pgpool2_watchdog
   become: yes
 
 # Tasks for setting up pgpoolII
diff --git a/roles/setup_pgpool2/tasks/setup_pgpool2.yml b/roles/setup_pgpool2/tasks/setup_pgpool2.yml
index 24c3ac4f4..0c06d0f0d 100644
--- a/roles/setup_pgpool2/tasks/setup_pgpool2.yml
+++ b/roles/setup_pgpool2/tasks/setup_pgpool2.yml
@@ -34,7 +34,7 @@
     msg: "Watchdog settings not valid: pgpool2_vip = '{{ pgpool2_vip }}',
           pgpool2_vip_dev = '{{ pgpool2_vip_dev }}'"
   when:
-    - pgpool2_watchdog is true
+    - pgpool2_watchdog
     - (pgpool2_vip is not defined or pgpool2_vip|length == 0) or
       (pgpool2_vip_dev is not defined or pgpool2_vip_dev|length == 0)
 
@@ -175,12 +175,12 @@
 - name: Include the pgpool2_setup_ssl
   include_tasks: pgpool2_setup_ssl.yml
   when:
-    - pgpool2_ssl is true
+    - pgpool2_ssl
 
 - name: Include the pgpool2_configure_loadbalancing
   include_tasks: pgpool2_configure_loadbalancing.yml
   when:
-    - pgpool2_load_balancing is true
+    - pgpool2_load_balancing
 
 - name: Include the pgpool2_configure_backend_pg_hba
   include_tasks:
@@ -198,7 +198,7 @@
 - name: Include the pgpool2_setup_watchdog
   include_tasks: pgpool2_setup_watchdog.yml
   when:
-    - pgpool2_watchdog is true
+    - pgpool2_watchdog
   vars:
     pgpool2_node_list: "{{ _pgpool2_node_list }}"
     pgpool2_current_node: "{{ _pgpool2_current_node }}"