diff --git a/_config.yml b/_config.yml
index 094f292450..28c1a7fea0 100644
--- a/_config.yml
+++ b/_config.yml
@@ -228,6 +228,11 @@ heading_anchors: false
 # Adds on-hover anchor links to h2-h6
 anchor_links: true
 
+# This setting governs including warning on every page
+# 'unsupported' produces red warning, 'supported' produces yellow warning
+# everything else produces no warning
+doc_version: unsupported
+
 footer_content:
 
 plugins:
diff --git a/_includes/warning.html b/_includes/warning.html
deleted file mode 100644
index 3c9382e159..0000000000
--- a/_includes/warning.html
+++ /dev/null
@@ -1 +0,0 @@
-<p class="warning">This version of the OpenSearch documentation is no longer maintained. For the latest version, see the <a href="{{ site.url }}/docs{{ page.url }}">current documentation</a>. For information about OpenSearch version maintenance, see <a href="https://opensearch.org/releases.html">Release Schedule and Maintenance Policy</a>.</p>
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index a209e60393..52d34e97d3 100755
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -137,7 +137,13 @@
           {% endif %}
         {% endunless %}
         <div id="main-content" class="main-content" role="main">
-          {% include warning.html %}
+          {% if page.section == "opensearch" %}
+            {% if site.doc_version == "supported" %}            
+              <p class="supported-version-warning">This is an earlier version of the OpenSearch documentation. For the latest version, see the <a href="{{ site.url }}/docs{{ page.url }}">current documentation</a>. For information about OpenSearch version maintenance, see <a href="https://opensearch.org/releases.html">Release Schedule and Maintenance Policy</a>.</p>
+            {% elsif site.doc_version == "unsupported" %}
+              <p class="unsupported-version-warning">This version of the OpenSearch documentation is no longer maintained. For the latest version, see the <a href="{{ site.url }}/docs{{ page.url }}">current documentation</a>. For information about OpenSearch version maintenance, see <a href="https://opensearch.org/releases.html">Release Schedule and Maintenance Policy</a>.</p>
+            {% endif %}
+          {% endif %}
           {% if site.heading_anchors != false %}
             {% include vendor/anchor_headings.html html=content beforeHeading="true" anchorBody="<svg viewBox=\"0 0 16 16\" aria-hidden=\"true\"><use xlink:href=\"#svg-link\"></use></svg>" anchorClass="anchor-heading" anchorAttrs="aria-labelledby=\"%html_id%\"" %}
           {% else %}
diff --git a/_sass/custom/custom.scss b/_sass/custom/custom.scss
index 745aa5b992..5b958369ea 100644
--- a/_sass/custom/custom.scss
+++ b/_sass/custom/custom.scss
@@ -167,6 +167,27 @@ img {
   border-left: 5px solid $red-100;
 }
 
+@mixin version-warning ( $version: 'latest' ){
+  @extend %callout, .panel;
+  font-weight: 600;
+  @if $version == 'unsupported' {
+    border-left: 5px solid $red-100;
+    background-color: mix(white, $red-100, 80%);
+  }
+  @else if $version == 'supported' {
+    border-left: 5px solid $yellow-000;
+    background-color: mix(white, $yellow-000, 80%);
+  }
+}
+
+.supported-version-warning {
+  @include version-warning('supported');
+}
+
+.unsupported-version-warning {
+  @include version-warning('unsupported');
+}
+
 // Labels
 .label,
 .label-blue {