diff --git a/roles/etc_hosts/tasks/main.yml b/roles/etc_hosts/tasks/main.yml
index de63508..c296933 100644
--- a/roles/etc_hosts/tasks/main.yml
+++ b/roles/etc_hosts/tasks/main.yml
@@ -1,13 +1,13 @@
 ---
 - name: Set etc_hosts_etc_hosts_file if running in Docker
-  set_fact:
+  ansible.builtin.set_fact:
     etc_hosts_etc_hosts_file: "{{ etc_hosts_etc_hosts_file }}.docker"
   when:
     - ansible_virtualization_type | regex_search("docker|podman|container")
 
 
 - name: Deploy {{ etc_hosts_etc_hosts_file }}
-  template:
+  ansible.builtin.template:
     src: templates/etc_hosts.j2
     dest: "{{ etc_hosts_etc_hosts_file }}"
     mode: "0644"
diff --git a/roles/hostname/handlers/main.yml b/roles/hostname/handlers/main.yml
index ba3bb12..3eb198f 100644
--- a/roles/hostname/handlers/main.yml
+++ b/roles/hostname/handlers/main.yml
@@ -1,46 +1,46 @@
 ---
-- name: restart_syslog_centos_7
-  service:
+- name: Restart_syslog_centos_7
+  ansible.builtin.service:
     name  : rsyslog
     state : restarted
 
-- name: restart_syslog_centos_8
-  service:
+- name: Restart_syslog_centos_8
+  ansible.builtin.service:
     name  : syslog
     state : restarted
 
-- name: restart_syslog_centos_9
-  service:
+- name: Restart_syslog_centos_9
+  ansible.builtin.service:
     name  : rsyslog
     state : restarted
 
-- name: restart_syslog_redhat_8
-  service:
+- name: Restart_syslog_redhat_8
+  ansible.builtin.service:
     name  : rsyslog
     state : restarted
 
-- name: restart_syslog_redhat_9
-  service:
+- name: Restart_syslog_redhat_9
+  ansible.builtin.service:
     name  : rsyslog
     state : restarted
 
-- name: restart_syslog_debian_11
-  service:
+- name: Restart_syslog_debian_11
+  ansible.builtin.service:
     name  : rsyslog
     state : restarted
 
-- name: restart_syslog_debian_12
-  service:
+- name: Restart_syslog_debian_12
+  ansible.builtin.service:
     name  : rsyslog
     state : restarted
 
-- name: restart_syslog_fedora_35
-  service:
+- name: Restart_syslog_fedora_35
+  ansible.builtin.service:
     name  : rsyslog
     state : restarted
 
-- name: restart_syslog_fedora_38
-  service:
+- name: Restart_syslog_fedora_38
+  ansible.builtin.service:
     name  : rsyslog
     state : started
 
diff --git a/roles/hostname/tasks/main.yml b/roles/hostname/tasks/main.yml
index 89d79f3..21984cb 100644
--- a/roles/hostname/tasks/main.yml
+++ b/roles/hostname/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 - name: Set hostname for host
-  hostname:
+  ansible.builtin.hostname:
     name: "{{ inventory_hostname }}"
   notify:
-    - "restart_syslog_{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}"
+    - "Restart_syslog_{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}"
 
 
 ...
diff --git a/roles/motd/defaults/main.yml b/roles/motd/defaults/main.yml
index ae0b4be..497e09c 100644
--- a/roles/motd/defaults/main.yml
+++ b/roles/motd/defaults/main.yml
@@ -1,16 +1,5 @@
 ---
-__project_author : Chris Hammer
-__project_email  : chris@thezengarden.net
-__project_repo   : https://github.com/jchristianh-ansible-collections/baseos
-
-
-__template_header : The Zen Garden
-
-
-__motd_file        : /etc/motd
-__motd_file_docker : /etc/motd
-__motd_version     : 1.0.0
-__motd_revision    : 22318
+motd_motd_file        : /etc/motd
 
 
 ...
diff --git a/roles/motd/tasks/main.yml b/roles/motd/tasks/main.yml
index 43ab06f..3c0a65c 100644
--- a/roles/motd/tasks/main.yml
+++ b/roles/motd/tasks/main.yml
@@ -1,27 +1,27 @@
 ---
 - name: Set host IP address or set a default
-  set_fact:
+  ansible.builtin.set_fact:
     host_ip : "{{ ansible_default_ipv4.address | default('127.0.0.1') }}"
 
 
 - name: Install Perl if needed
-  package:
+  ansible.builtin.package:
     name  : perl
     state : present
 
 
 - name: Get system uptime from script
-  script:
+  ansible.builtin.script:
     cmd        : "scripts/get_uptime.pl {{ ansible_uptime_seconds }}"
   register     : node_uptime
   changed_when : false
 
 
 - name: Update MOTD
-  template:
+  ansible.builtin.template:
     src        : templates/motd.j2
-    dest       : "{{ __motd_file }}"
-    mode       : 0644
+    dest       : "{{ motd_motd_file }}"
+    mode       : "0644"
   changed_when : false
 
 
diff --git a/roles/motd/templates/.keep b/roles/motd/templates/.keep
deleted file mode 100644
index e69de29..0000000