diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml
index f9f4cc5..ad88610 100644
--- a/config/packages/twig.yaml
+++ b/config/packages/twig.yaml
@@ -1,6 +1,9 @@
 twig:
     default_path: '%kernel.project_dir%/templates'
+    globals:
+        motd: '%env(MOTD)%'
 
 when@test:
     twig:
         strict_variables: true
+        
diff --git a/templates/_header.html.twig b/templates/_header.html.twig
index 92af358..0bf57f3 100644
--- a/templates/_header.html.twig
+++ b/templates/_header.html.twig
@@ -17,6 +17,5 @@
 				<div class="d-flex flex-row flex-fill justify-content-between" style="background: url({{asset('images/header-left.png')}}) left center no-repeat, url({{asset('images/header-right.png')}}) 72px center no-repeat; background-size: 72px 100%, 100% 100%; "></div>
 			</div>
 		</div>
-
 		
 	</header>
\ No newline at end of file
diff --git a/templates/_navbar.html.twig b/templates/_navbar.html.twig
index 2345103..80c555f 100644
--- a/templates/_navbar.html.twig
+++ b/templates/_navbar.html.twig
@@ -37,4 +37,14 @@
                 </a>
             </h3>
 		</ul>
-	</div>
\ No newline at end of file
+	</div>
+    {# Display MOTD, if one is set #}
+    {% if motd is defined and motd is not empty %}
+    <div class="alert alert-info alert-dismissible fade show" role="alert">
+    <div class="row justify-content-end">
+			<div class="col-xs-12 col-lg-10 justify-content-end">
+                {{ motd }}
+            </div>
+			<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+		</div></div>
+    {% endif %}
\ No newline at end of file