diff --git a/roles/bootstrap_puppet_infra_node/templates/puppet.conf.j2 b/roles/bootstrap_puppet_infra_node/templates/puppet.conf.j2
index 3092320..b7ffe61 100644
--- a/roles/bootstrap_puppet_infra_node/templates/puppet.conf.j2
+++ b/roles/bootstrap_puppet_infra_node/templates/puppet.conf.j2
@@ -11,5 +11,5 @@ templatedir=$confdir/templates
 [master]
 # These are needed when the puppetmaster is run by passenger
 # and can safely be removed if webrick is used.
-ssl_client_header = SSL_CLIENT_S_DN 
+ssl_client_header = SSL_CLIENT_S_DN
 ssl_client_verify_header = SSL_CLIENT_VERIFY
diff --git a/roles/bootstrap_puppetmaster/templates/puppet.conf.j2 b/roles/bootstrap_puppetmaster/templates/puppet.conf.j2
index 1c631f6..b715800 100644
--- a/roles/bootstrap_puppetmaster/templates/puppet.conf.j2
+++ b/roles/bootstrap_puppetmaster/templates/puppet.conf.j2
@@ -11,6 +11,6 @@ templatedir=$confdir/templates
 [master]
 # These are needed when the puppetmaster is run by passenger
 # and can safely be removed if webrick is used.
-ssl_client_header = SSL_CLIENT_S_DN 
+ssl_client_header = SSL_CLIENT_S_DN
 ssl_client_verify_header = SSL_CLIENT_VERIFY
 autosign = true
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index c3561db..0befdb8 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -7,7 +7,7 @@
 - name: Install Puppetlabs repository deb package
   apt: deb=/tmp/puppetlabs-release-{{ansible_distribution_release}}.deb
 
-- name: Update packages 
+- name: Update packages
   apt: update_cache=yes
 
 - name: Install Puppet and other required packages
diff --git a/roles/provision_infra_servers/tasks/main.yml b/roles/provision_infra_servers/tasks/main.yml
index 9961853..2abeace 100644
--- a/roles/provision_infra_servers/tasks/main.yml
+++ b/roles/provision_infra_servers/tasks/main.yml
@@ -12,7 +12,7 @@
       - net-name: "{{ item.net_name }}"
     security_groups: "{{ item.security_groups }}"
     auto_floating_ip: yes
-    meta: 
+    meta:
       group: infra
       infra_type: "{{ item.infra_type }}"
   with_items: infra_servers
diff --git a/roles/set_hostnames/tasks/main.yml b/roles/set_hostnames/tasks/main.yml
index 00bf696..e796916 100644
--- a/roles/set_hostnames/tasks/main.yml
+++ b/roles/set_hostnames/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
-# Set hostname and /etc/hosts 
-# Inspired by: 
+# Set hostname and /etc/hosts
+# Inspired by:
 # https://github.com/ansible/ansible/pull/8482)
 # https://gist.github.com/rothgar/8793800
-- name: Set /etc/hostname 
+- name: Set /etc/hostname
   hostname: name="{{ inventory_hostname.split('.', 1)[0] }}"
 
 # " lovely lonely double-quote for fixing vim highlighting