diff --git a/puppet-manifests/src/modules/platform/manifests/config.pp b/puppet-manifests/src/modules/platform/manifests/config.pp
index 3a4964e79..aa5df6831 100644
--- a/puppet-manifests/src/modules/platform/manifests/config.pp
+++ b/puppet-manifests/src/modules/platform/manifests/config.pp
@@ -15,6 +15,7 @@ class platform::config
   include ::platform::params
   include ::platform::anchors
   include ::platform::config::pam_systemd
+  include ::platform::config::system_name
 
   stage { 'pre':
     before => Stage['main'],
@@ -257,6 +258,18 @@ class platform::config::hostname {
   }
 }
 
+class platform::config::system_name {
+  $system_name = $platform::params::system_name
+
+  file { '/etc/sysinv/motd.system':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    content => template('platform/system_name.erb'),
+  }
+}
+
 class platform::config::apparmor {
   include ::platform::params
 
diff --git a/puppet-manifests/src/modules/platform/templates/system_name.erb b/puppet-manifests/src/modules/platform/templates/system_name.erb
new file mode 100644
index 000000000..4d26ae9f8
--- /dev/null
+++ b/puppet-manifests/src/modules/platform/templates/system_name.erb
@@ -0,0 +1,9 @@
+<%
+if !@system_name.nil? && !@system_name.empty?
+-%>
+
+<%= "====================================================================" %>
+<%= "         SYSTEM: #{@system_name}" %>
+<%= "====================================================================" %>
+
+<% end -%>