diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 4758d77..8860e9e 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -31,23 +31,15 @@
     state: present
   when: ansible_os_family == "Debian"
 
-- name: Create keyrings directory
-  ansible.builtin.file:
-    path: /etc/apt/keyrings
-    state: directory
-    mode: '0755'
-  when: ansible_os_family == "Debian"
-
 - name: Add Docker GPG key
-  ansible.builtin.get_url:
+  ansible.builtin.apt_key:
     url: https://download.docker.com/linux/debian/gpg
-    dest: /etc/apt/keyrings/docker.asc
-    mode: '0644'
+    state: present
   when: ansible_os_family == "Debian"
 
 - name: Add Docker repository
   ansible.builtin.apt_repository:
-    repo: "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable"
+    repo: "deb [arch=amd64] https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable"
     state: present
   when: ansible_os_family == "Debian"
 
@@ -69,11 +61,3 @@
     state: started
     enabled: true
   when: ansible_virtualization_type != "docker"
-
-- name: Set custom MOTD
-  ansible.builtin.template:
-    src: motd.j2
-    dest: /etc/motd
-    owner: root
-    group: root
-    mode: '0644'
diff --git a/roles/base/templates/motd.j2 b/roles/base/templates/motd.j2
deleted file mode 100644
index cbc0d0f..0000000
--- a/roles/base/templates/motd.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-
-▗▄▄▄ ▗▄▄▄▖ ▗▄▄▖▗▄▄▄▖▗▄▄▄▖▗▄▖ ▗▖   ▗▄▄▖  ▗▄▖  ▗▄▖ ▗▄▄▖ ▗▄▄▄
-▐▌  █  █  ▐▌     █    █ ▐▌ ▐▌▐▌   ▐▌ ▐▌▐▌ ▐▌▐▌ ▐▌▐▌ ▐▌▐▌  █
-▐▌  █  █  ▐▌▝▜▌  █    █ ▐▛▀▜▌▐▌   ▐▛▀▚▖▐▌ ▐▌▐▛▀▜▌▐▛▀▚▖▐▌  █
-▐▙▄▄▀▗▄█▄▖▝▚▄▞▘▗▄█▄▖  █ ▐▌ ▐▌▐▙▄▄▖▐▙▄▞▘▝▚▄▞▘▐▌ ▐▌▐▌ ▐▌▐▙▄▄▀
-
-
-Hostname: {{ ansible_hostname }}
-Distribution: {{ ansible_distribution }} {{ ansible_distribution_version }}
-Kernel: {{ ansible_kernel }}
\ No newline at end of file