diff --git a/roles/ssh/files/etc/update-motd.d/05-screenfetch b/roles/ssh/files/etc/update-motd.d/05-screenfetch
new file mode 100644
index 0000000..d9e42f4
--- /dev/null
+++ b/roles/ssh/files/etc/update-motd.d/05-screenfetch
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+screenfetch
diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml
index d6d1d67..608051c 100644
--- a/roles/ssh/tasks/main.yml
+++ b/roles/ssh/tasks/main.yml
@@ -2,3 +2,5 @@
 - import_tasks: install.yml
 
 - import_tasks: keys.yml
+
+- import_tasks: motd.yml
diff --git a/roles/ssh/tasks/motd.yml b/roles/ssh/tasks/motd.yml
new file mode 100644
index 0000000..6211141
--- /dev/null
+++ b/roles/ssh/tasks/motd.yml
@@ -0,0 +1,20 @@
+---
+- become: yes
+  block:
+    - name: disable help in ubuntu
+      when: ansible_distribution == "Ubuntu"
+      file:
+        path: /etc/update-motd.d/10-help-text
+        mode: '0644'
+
+    - name: install screenfetch
+      apt:
+        update_cache: yes
+        pkg:
+          - screenfetch
+
+    - name: add screenfetch to motd
+      copy:
+        src: etc/update-motd.d/05-screenfetch
+        dest: /etc/update-motd.d/05-screenfetch
+        mode: '0755'