diff --git a/roles/matrix-awx/tasks/backup_server.yml b/roles/matrix-awx/tasks/backup_server.yml
index 556c4497..2459fc8a 100644
--- a/roles/matrix-awx/tasks/backup_server.yml
+++ b/roles/matrix-awx/tasks/backup_server.yml
@@ -33,7 +33,7 @@
       curl -sku {{ tower_username }}:{{ tower_password }} -H "Content-Type: application/json" -X POST -d '{"description":"Tower CLI", "application":null, "scope":"write"}' https://{{ tower_host }}/api/v2/users/1/personal_tokens/ | jq '.token' | sed -r 's/\"//g'
   register: tower_token
   no_log: True
-  
+
 - name: Recreate 'Backup Server' job template
   delegate_to: 127.0.0.1
   awx.awx.tower_job_template:
@@ -62,8 +62,7 @@
 - name: Set boolean value to exit playbook
   set_fact:
     end_playbook: true
-  
+
 - name: End playbook if this task list is called.
   meta: end_play
   when: end_playbook is defined and end_playbook|bool
-
diff --git a/roles/matrix-awx/tasks/create_user.yml b/roles/matrix-awx/tasks/create_user.yml
index 0993d61f..13a30596 100755
--- a/roles/matrix-awx/tasks/create_user.yml
+++ b/roles/matrix-awx/tasks/create_user.yml
@@ -10,10 +10,10 @@
   when: admin_access == 'false'
 
 - name: Examine if server admin set
-  set_fact:      
+  set_fact:
     admin_bool: 1
   when: admin_access == 'true'
-  
+
 - name: Set boolean value to exit playbook
   set_fact:
     end_playbook: true
@@ -25,7 +25,7 @@
 
 - name: Result
   debug: msg="{{ cmd.stdout }}"
-  
+
 - name: End playbook if this task list is called.
   meta: end_play
   when: end_playbook is defined and end_playbook|bool
diff --git a/roles/matrix-awx/tasks/customise_website_access_export.yml b/roles/matrix-awx/tasks/customise_website_access_export.yml
index 4b775105..40ae1bfd 100755
--- a/roles/matrix-awx/tasks/customise_website_access_export.yml
+++ b/roles/matrix-awx/tasks/customise_website_access_export.yml
@@ -21,7 +21,7 @@
   with_dict:
     'matrix_nginx_proxy_base_domain_homepage_enabled': 'false'
   when: customise_base_domain_website|bool == true
-    
+
 - name: Record custom 'Customise Website + Access Export' variables locally on AWX
   delegate_to: 127.0.0.1
   lineinfile:
@@ -34,7 +34,7 @@
     'sftp_auth_method': '"{{ sftp_auth_method }}"'
     'sftp_password': '"{{ sftp_password }}"'
     'sftp_public_key': '"{{ sftp_public_key }}"'
-    
+
 - name: Copy new 'matrix_vars.yml' to target machine
   copy:
     src: '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/matrix_vars.yml'
@@ -170,7 +170,7 @@
     group: sftp
     mode: '0644'
   when: (sftp_public_key | length > 0) and (sftp_auth_method == "SSH Key")
-  
+
 - name: Alter SSH Subsystem State 1
   lineinfile:
     path: /etc/ssh/sshd_config
@@ -227,4 +227,3 @@
   service:
     name: ssh.service
     state: restarted
-
diff --git a/roles/matrix-awx/tasks/load_matrix_variables.yml b/roles/matrix-awx/tasks/load_matrix_variables.yml
index 0174e0e6..ff0986d7 100755
--- a/roles/matrix-awx/tasks/load_matrix_variables.yml
+++ b/roles/matrix-awx/tasks/load_matrix_variables.yml
@@ -3,4 +3,3 @@
   include_vars:
     file: '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/matrix_vars.yml'
   no_log: True
-
diff --git a/roles/matrix-awx/tasks/main.yml b/roles/matrix-awx/tasks/main.yml
index f7f5bf1f..4c2c5285 100755
--- a/roles/matrix-awx/tasks/main.yml
+++ b/roles/matrix-awx/tasks/main.yml
@@ -16,7 +16,7 @@
   when: run_setup|bool and matrix_awx_enabled|bool
   tags:
     - create-user
-    
+
 # Perform extra self-check functions
 - import_tasks: "{{ role_path }}/tasks/self_check.yml"
   when: run_setup|bool and matrix_awx_enabled|bool
@@ -58,12 +58,12 @@
   when: run_setup|bool and matrix_awx_enabled|bool
   tags:
     - setup-ma1sd
-    
+
 # Additional playbook to set the variable file during Corporal configuration
 - import_tasks: "{{ role_path }}/tasks/set_variables_corporal.yml"
   when: run_setup|bool and matrix_awx_enabled|bool
   tags:
-    - setup-corporal  
+    - setup-corporal
 
 # Additional playbook to set the variable file during Synapse Admin configuration
 - import_tasks: "{{ role_path }}/tasks/set_variables_synapse_admin.yml"
@@ -76,4 +76,3 @@
   when: run_setup|bool and matrix_awx_enabled|bool
   tags:
     - always
-
diff --git a/roles/matrix-awx/tasks/self_check.yml b/roles/matrix-awx/tasks/self_check.yml
index 977293d0..8d647574 100644
--- a/roles/matrix-awx/tasks/self_check.yml
+++ b/roles/matrix-awx/tasks/self_check.yml
@@ -1,21 +1,21 @@
 
 - name: Install prerequisite apt packages on target
   apt:
-    name: 
+    name:
       - sysstat
     state: present
-    
+
 - name: Install prerequisite yum packages on AWX
   delegate_to: 127.0.0.1
   yum:
-    name: 
+    name:
       - bind-utils
     state: present
-    
+
 - name: Install prerequisite pip packages on AWX
   delegate_to: 127.0.0.1
   pip:
-    name: 
+    name:
       - dnspython
     state: present
 
@@ -23,7 +23,7 @@
   shell: iostat -c
   register: cpu_usage_stat
   no_log: True
-    
+
 - name: Print CPU usage statistics
   debug:
     msg: "{{ cpu_usage_stat.stdout.split('\n') }}"
@@ -91,4 +91,3 @@
   debug:
     msg: "{{ docker_stats.stdout.split('\n') }}"
   when: docker_stats is defined
-
diff --git a/roles/matrix-awx/tasks/set_variables_corporal.yml b/roles/matrix-awx/tasks/set_variables_corporal.yml
index efc44a42..d8ac038d 100755
--- a/roles/matrix-awx/tasks/set_variables_corporal.yml
+++ b/roles/matrix-awx/tasks/set_variables_corporal.yml
@@ -8,7 +8,7 @@
     insertafter: '# Corporal Settings'
   with_dict:
     'matrix_corporal_enabled': '{{ matrix_corporal_enabled }}'
-    
+
 - name: Enable Shared Secret Auth if Corporal enabled
   delegate_to: 127.0.0.1
   lineinfile:
@@ -19,7 +19,7 @@
   with_dict:
     'matrix_synapse_ext_password_provider_shared_secret_auth_enabled': 'true'
   when: matrix_corporal_enabled|bool
-  
+
 - name: Disable Shared Secret Auth if Corporal disabled
   delegate_to: 127.0.0.1
   lineinfile:
@@ -30,7 +30,7 @@
   with_dict:
     'matrix_synapse_ext_password_provider_shared_secret_auth_enabled': 'false'
   when: not matrix_corporal_enabled|bool
-  
+
 - name: Enable Rest Auth Endpoint if Corporal enabled
   delegate_to: 127.0.0.1
   lineinfile:
@@ -97,7 +97,7 @@
           "Type": "static_file",
           "Path": "/etc/matrix-corporal/corporal-policy.json"
         }
-  when: matrix_corporal_policy_provider_mode == "Simple Static File" 
+  when: matrix_corporal_policy_provider_mode == "Simple Static File"
 
 - name: Touch the /matrix/corporal/ directory
   file:
@@ -130,7 +130,7 @@
     owner: matrix
     group: matrix
     mode: '660'
-    
+
 - name: Touch the last-policy.json file to ensure it exists
   file:
     path: "/matrix/corporal/config/last-policy.json"
@@ -138,7 +138,7 @@
     owner: matrix
     group: matrix
     mode: '660'
-  
+
 - name: Record 'Simple Static File' configuration content in corporal-policy.json
   copy:
     content: "{{ matrix_corporal_simple_static_config | string  }}"
@@ -211,16 +211,16 @@
     src: '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/configure_corporal.json'
     dest: '/matrix/awx/configure_corporal.json'
     mode: '0660'
-    
+
 - debug:
     msg: "matrix_corporal_matrix_homeserver_api_endpoint: {{ matrix_corporal_matrix_homeserver_api_endpoint }}"
-    
+
 - debug:
     msg: "matrix_corporal_matrix_auth_shared_secret: {{ matrix_corporal_matrix_auth_shared_secret }}"
 
 - debug:
     msg: "matrix_corporal_http_gateway_internal_rest_auth_enabled: {{ matrix_corporal_http_gateway_internal_rest_auth_enabled }}"
-   
+
 - debug:
     msg: "matrix_corporal_matrix_registration_shared_secret: {{ matrix_corporal_matrix_registration_shared_secret }}"
 
@@ -251,4 +251,3 @@
     tower_host: "https://{{ tower_host }}"
     tower_oauthtoken: "{{ tower_token.stdout }}"
     validate_certs: yes
-    
diff --git a/roles/matrix-awx/tasks/set_variables_element.yml b/roles/matrix-awx/tasks/set_variables_element.yml
index 892c1bac..a21a9dd8 100755
--- a/roles/matrix-awx/tasks/set_variables_element.yml
+++ b/roles/matrix-awx/tasks/set_variables_element.yml
@@ -53,7 +53,7 @@
       curl -sku {{ tower_username }}:{{ tower_password }} -H "Content-Type: application/json" -X POST -d '{"description":"Tower CLI", "application":null, "scope":"write"}' https://{{ tower_host }}/api/v2/users/1/personal_tokens/ | jq '.token' | sed -r 's/\"//g'
   register: tower_token
   no_log: True
-  
+
 - name: Recreate 'Configure Element' job template
   delegate_to: 127.0.0.1
   awx.awx.tower_job_template:
@@ -74,4 +74,3 @@
     tower_host: "https://{{ tower_host }}"
     tower_oauthtoken: "{{ tower_token.stdout }}"
     validate_certs: yes
-
diff --git a/roles/matrix-awx/tasks/set_variables_jitsi.yml b/roles/matrix-awx/tasks/set_variables_jitsi.yml
index e35beab7..4a871a18 100755
--- a/roles/matrix-awx/tasks/set_variables_jitsi.yml
+++ b/roles/matrix-awx/tasks/set_variables_jitsi.yml
@@ -55,4 +55,3 @@
     tower_host: "https://{{ tower_host }}"
     tower_oauthtoken: "{{ tower_token.stdout }}"
     validate_certs: yes
-
diff --git a/roles/matrix-awx/tasks/set_variables_ma1sd.yml b/roles/matrix-awx/tasks/set_variables_ma1sd.yml
index 256a2410..32dadc0a 100755
--- a/roles/matrix-awx/tasks/set_variables_ma1sd.yml
+++ b/roles/matrix-awx/tasks/set_variables_ma1sd.yml
@@ -44,14 +44,14 @@
     regexp: '^.*\n'
     after: '# Start ma1sd Extension'
     before: '# End ma1sd Extension'
-    
+
 - name: Replace conjoined ma1sd configuration extension limiters
   delegate_to: 127.0.0.1
   replace:
     path: '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/matrix_vars.yml'
     regexp: '^# Start ma1sd Extension# End ma1sd Extension'
     replace: '# Start ma1sd Extension\n# End ma1sd Extension'
-  
+
 - name: Insert ma1sd configuration extension header if using external LDAP/AD with ma1sd
   delegate_to: 127.0.0.1
   lineinfile:
@@ -125,6 +125,5 @@
     tower_host: "https://{{ tower_host }}"
     tower_oauthtoken: "{{ tower_token.stdout }}"
     validate_certs: yes
-    
-# ^ This playbook isn't executing so the survey isn't being updated! :P
 
+# ^ This playbook isn't executing so the survey isn't being updated! :P
diff --git a/roles/matrix-awx/tasks/set_variables_synapse.yml b/roles/matrix-awx/tasks/set_variables_synapse.yml
index 979190ce..a8cc418b 100755
--- a/roles/matrix-awx/tasks/set_variables_synapse.yml
+++ b/roles/matrix-awx/tasks/set_variables_synapse.yml
@@ -15,7 +15,7 @@
     'matrix_synapse_max_upload_size_mb': '{{ matrix_synapse_max_upload_size_mb }}'
     'matrix_synapse_url_preview_enabled': '{{ matrix_synapse_url_preview_enabled }}'
     'matrix_synapse_allow_guest_access': '{{ matrix_synapse_allow_guest_access }}'
-  
+
 - name: Empty Synapse variable 'matrix_synapse_auto_join_rooms' locally on AWX, if raw inputs empty
   delegate_to: 127.0.0.1
   replace:
@@ -143,7 +143,7 @@
     line: "    - {{ item }}"
   with_items: "{{ ext_federation_whitelist_raw.splitlines() }}"
   when: ext_federation_whitelist_raw|length > 0
-  
+
 - name: Record Synapse Custom variables locally on AWX
   delegate_to: 127.0.0.1
   lineinfile:
@@ -220,4 +220,3 @@
     tower_host: "https://{{ tower_host }}"
     tower_oauthtoken: "{{ tower_token.stdout }}"
     validate_certs: yes
-
diff --git a/roles/matrix-awx/tasks/set_variables_synapse_admin.yml b/roles/matrix-awx/tasks/set_variables_synapse_admin.yml
index 30cf12b4..42084ad7 100644
--- a/roles/matrix-awx/tasks/set_variables_synapse_admin.yml
+++ b/roles/matrix-awx/tasks/set_variables_synapse_admin.yml
@@ -54,5 +54,3 @@
     tower_host: "https://{{ tower_host }}"
     tower_oauthtoken: "{{ tower_token.stdout }}"
     validate_certs: yes
-
-