diff --git a/meta/runtime.yml b/meta/runtime.yml
index ce6befd..1e85b01 100644
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -1,2 +1,2 @@
 ---
-requires_ansible: ">=2.14.0"
+requires_ansible: ">=2.15.0"
diff --git a/roles/motd/tasks/main.yml b/roles/motd/tasks/main.yml
index 8cee9ce..a6b46ac 100644
--- a/roles/motd/tasks/main.yml
+++ b/roles/motd/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Format uptime using Jinja
   ansible.builtin.set_fact:
-    uptime_formatted: |
+    motd_uptime_formatted: |
       {% if 'day' in motd_host_uptime %}
         {{ motd_host_uptime | regex_replace(motd_day_filter, motd_day_filter_repl) }}
       {% else %}
@@ -11,10 +11,10 @@
 
 - name: Update MOTD
   ansible.builtin.template:
-    src        : templates/motd.j2
-    dest       : "{{ motd_motd_file }}"
-    mode       : "0644"
-  changed_when : false
+    src: templates/motd.j2
+    dest: "{{ motd_motd_file }}"
+    mode: "0644"
+  changed_when: false
 
 
 ...
diff --git a/roles/motd/templates/motd.j2 b/roles/motd/templates/motd.j2
index e63fe88..b5a1f07 100644
--- a/roles/motd/templates/motd.j2
+++ b/roles/motd/templates/motd.j2
@@ -19,6 +19,6 @@ IP       : {{ motd_host_ip }}
 CPU      : {{ ansible_processor_vcpus }} x {{ ansible_processor[2] | regex_replace('\\s+', ' ') }}
 Memory   : {{ "{0:0.2f}".format(ansible_memfree_mb/1024) }} GB free of {{ (ansible_memtotal_mb/1024)|round}} GB
 Platform : {{ ansible_distribution }} {{ ansible_distribution_version }} {{ ansible_kernel }}
-Up       : {{ uptime_formatted | trim }}
+Up       : {{ motd_uptime_formatted | trim }}
 
 
diff --git a/roles/node_status/tasks/main.yml b/roles/node_status/tasks/main.yml
index db601f3..1fd334b 100644
--- a/roles/node_status/tasks/main.yml
+++ b/roles/node_status/tasks/main.yml
@@ -11,19 +11,17 @@
       run_once: true
       delegate_to: "{{ node_status_host }}"
 
-
     - name: Capture system uptime
       ansible.builtin.command  : uptime
-      register: r_node_status_uptime
+      register: node_status_sys_uptime
       changed_when: false
 
-
     - name: Log node status
       ansible.builtin.lineinfile:
         path: "{{ node_status_dir }}/{{ node_status_file }}"
         state: present
         regexp: "{{ inventory_hostname }}"
-        line: "{{ ansible_date_time.epoch }},,{{ inventory_hostname }},,{{ ansible_distribution }} {{ ansible_distribution_version }},,{{ r_node_status_uptime.stdout }}"
+        line: "{{ ansible_date_time.epoch }},,{{ inventory_hostname }},,{{ ansible_distribution }} {{ ansible_distribution_version }},,{{ node_status_sys_uptime.stdout }}"
         create: true
         mode: '0644'
         owner: "{{ node_status_user }}"