diff --git a/roles/product_install/tasks/main.yml b/roles/product_install/tasks/main.yml
index e2773c1..6d68992 100644
--- a/roles/product_install/tasks/main.yml
+++ b/roles/product_install/tasks/main.yml
@@ -269,4 +269,4 @@
   include_tasks: "jira-servicedesk_as_obr.yml"
   when:
     - atl_install_jsd_as_obr is defined
-    - atl_install_jsd_as_obr
+    - atl_install_jsd_as_obr | bool
diff --git a/roles/product_startup/handlers/main.yml b/roles/product_startup/handlers/main.yml
index 6e9e1d8..75a567a 100644
--- a/roles/product_startup/handlers/main.yml
+++ b/roles/product_startup/handlers/main.yml
@@ -4,7 +4,7 @@
   service:
     name: "{{ atl_systemd_service_name }}"
     state: restarted
-  when: atl_startup_restart
+  when: atl_startup_restart | bool
   no_log: true
 
 - name: Enable Product