diff --git a/.gitignore b/.gitignore
index 3a77206..c46a9ec 100755
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@ logs/*
 # OS generated files #
 ######################
 ._*
+.ansible
 .tox
 *.egg-info
 .eggs
diff --git a/defaults/main.yml b/defaults/main.yml
index 95ef681..7c58e14 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -76,7 +76,7 @@ trove_api_workers: >-
 
 # uWSGI settings
 trove_wsgi_threads: 1
-trove_use_uwsgi: True
+trove_use_uwsgi: true
 trove_uwsgi_tls:
   crt: "{{ trove_ssl_cert }}"
   key: "{{ trove_ssl_key }}"
@@ -270,15 +270,15 @@ trove_service_nova_endpoint_type: "{{ trove_service_endpoint_type }}"
 trove_service_glance_endpoint_type: "{{ trove_service_endpoint_type }}"
 trove_service_swift_endpoint_type: "{{ trove_service_endpoint_type }}"
 
-trove_dns_domain_name: 'trove.com.'
-trove_dns_domain_id: '00000000-0000-0000-0000-000000000000'
+trove_dns_domain_name: "trove.com."
+trove_dns_domain_id: "00000000-0000-0000-0000-000000000000"
 # Notification topics for designate.
 trove_notifications_designate: notifications_designate
 
 # Trove service network settings.
 # These values are used when creating an OpenStack network to be used by Trove. By default the network will
 # not be created.
-trove_service_net_setup: False
+trove_service_net_setup: false
 trove_service_net_validate_certs: "False"
 trove_service_net_phys_net: dbaas-mgmt
 trove_service_net_type: flat
@@ -390,7 +390,7 @@ trove_pki_setup_host: "{{ openstack_pki_setup_host | default('localhost') }}"
 trove_pki_keys_path: "{{ trove_pki_dir ~ '/certs/private/' }}"
 trove_pki_certs_path: "{{ trove_pki_dir ~ '/certs/certs/' }}"
 trove_pki_intermediate_cert_name: "{{ openstack_pki_service_intermediate_cert_name | default('ExampleCorpIntermediate') }}"
-trove_pki_regen_cert: ''
+trove_pki_regen_cert: ""
 trove_pki_san: "{{ openstack_pki_san | default('DNS:' ~ ansible_facts['hostname'] ~ ',IP:' ~ management_address) }}"
 trove_pki_certificates:
   - name: "trove_{{ ansible_facts['hostname'] }}"
diff --git a/handlers/main.yml b/handlers/main.yml
index 2ea8eca..0f34f11 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -19,9 +19,9 @@
 - name: Restart Trove services
   systemd:
     name: "{{ item.service_name }}"
-    enabled: yes
+    enabled: true
     state: "restarted"
-    daemon_reload: yes
+    daemon_reload: true
   with_items: "{{ filtered_trove_services }}"
   register: _restart
   until: _restart is success
diff --git a/tasks/main.yml b/tasks/main.yml
index 1b4fa2d..97004c4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -198,7 +198,7 @@
     systemd_service_tasks_accounting: true
     systemd_services:
       - service_name: "{{ service_var.service_name }}"
-        enabled: yes
+        enabled: true
         state: started
         execstarts: "{{ service_var.execstarts }}"
         execreloads: "{{ service_var.execreloads | default([]) }}"
diff --git a/tasks/trove_db_sync.yml b/tasks/trove_db_sync.yml
index f7a2f22..f023466 100644
--- a/tasks/trove_db_sync.yml
+++ b/tasks/trove_db_sync.yml
@@ -18,6 +18,6 @@
 
 - name: Perform a trove DB sync
   command: "{{ trove_bin }}/trove-manage db_sync"
-  become: yes
+  become: true
   become_user: "{{ trove_system_user_name }}"
   changed_when: false
diff --git a/tasks/trove_service_network.yml b/tasks/trove_service_network.yml
index 860e8be..6016f6a 100644
--- a/tasks/trove_service_network.yml
+++ b/tasks/trove_service_network.yml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2016,2017 IBM Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +22,7 @@
       openstack.cloud.networks_info:
         cloud: default
         validate_certs: "{{ trove_service_net_validate_certs }}"
-        wait: yes
+        wait: true
         name: "{{ trove_service_net_name }}"
         endpoint_type: "{{ trove_service_net_endpoint_type }}"
       register: _get_trove_service_net