diff --git a/system/base.sls b/system/base.sls
index a4e2752..2aadeff 100644
--- a/system/base.sls
+++ b/system/base.sls
@@ -25,3 +25,14 @@ system_base_apps_dir:
     - group: root
     - dir_mode: '0755'
     - file_mode: '0644'
+
+system_base_os-release:
+  file.managed:
+    - name: /etc/os-release
+    - source: salt://{{ tpldir }}/files/base_os-release.jinja
+    - template: jinja
+    - context:
+        OS_VERSION: {{ salt['cmd.shell']('date "+%Y%m"') }}
+    - user: root
+    - group: root
+    - mode: '0644'
diff --git a/system/files/base_motd.jinja b/system/files/base_motd.jinja
index 4082bb7..89606aa 100644
--- a/system/files/base_motd.jinja
+++ b/system/files/base_motd.jinja
@@ -9,5 +9,5 @@
 ║                                               ║
 ╚═══════════════════════════════════════════════╝
 
-OS: {{ OS }}
+OS: {{ OS_NAME }}
 Version: {{ OS_VERSION }}