diff --git a/src/assets/images/logo-header.svg b/src/assets/images/logo-header.svg
new file mode 100644
index 0000000..e72f60b
--- /dev/null
+++ b/src/assets/images/logo-header.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Vector_based" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 138.1 53.2" style="enable-background:new 0 0 138.1 53.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#A7A9AC;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:#636467;}
+	.st6{enable-background:new    ;}
+	.st7{fill:#03A2D0;}
+</style>
+<title>Logo_BuiltOn</title>
+<g id="Layer_1-2">
+	<path class="st0" d="M138.1,25.5c-1.4-3-4.9-4.3-8-2.9c-3,1.4-4.3,4.9-2.9,8c1.4,3,4.9,4.3,8,2.9c1.2-0.6,2.3-1.6,2.9-2.8l-1.2-0.6
+		c-1.1,2.3-4,3.3-6.3,2.1c-2.3-1.1-3.3-4-2.1-6.3c1.1-2.3,4-3.3,6.3-2.1c1,0.5,1.8,1.3,2.2,2.3L138.1,25.5z"/>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="30.36" y1="739.56" x2="30.36" y2="785.8" gradientTransform="matrix(1 0 0 1 -15.74 -735.83)">
+		<stop  offset="0" style="stop-color:#01B0DA"/>
+		<stop  offset="1" style="stop-color:#078BC0"/>
+	</linearGradient>
+	<path class="st1" d="M9.1,26.5c0,3.9,1.3,7.7,3.8,10.8c0,0.1-0.1,0.2-0.1,0.3c-0.1,0.3-0.1,0.5-0.1,0.8c0,2,1.6,3.6,3.6,3.6
+		c2,0,3.6-1.6,3.6-3.6s-1.6-3.6-3.6-3.6l0,0h-0.4c-0.1,0-0.2,0-0.3,0.1c-4.7-6.1-3.5-14.7,2.5-19.4c0,0,0,0,0,0
+		c0.6-0.5,1.3-0.9,2-1.3l0,0V0.7l-0.3,0.1c-0.8,0.2-1.5,0.4-2.3,0.7c-0.4,0.2-0.8,0.3-1.2,0.5l0,0v10.4l0,0
+		C11.8,15.6,9.1,20.9,9.1,26.5z"/>
+	
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="29.9558" y1="744.74" x2="29.9558" y2="787.14" gradientTransform="matrix(1 0 0 1 -15.74 -735.83)">
+		<stop  offset="0" style="stop-color:#01B0DA"/>
+		<stop  offset="1" style="stop-color:#078BC0"/>
+	</linearGradient>
+	<path class="st2" d="M26.7,31.2c-2.6,0-4.7-2.1-4.7-4.6h-3.9c0,4,2.8,7.5,6.8,8.3v14.7C12.2,48.6,2.7,37.6,3.6,25
+		c0.3-4.6,2-9,4.9-12.6h0.3h0.3c1.9,0,3.5-1.6,3.5-3.5c0-1.9-1.6-3.5-3.5-3.5c-1.9,0-3.5,1.6-3.5,3.5c0,0.4,0.1,0.8,0.2,1.1
+		c-9.2,11.5-7.3,28.2,4.1,37.4c4.7,3.8,10.6,5.8,16.6,5.8c0.5,0,0.9,0,1.4,0h0.5l0,0V30.9C27.9,31.1,27.3,31.2,26.7,31.2z"/>
+	
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="54.2435" y1="752.5" x2="54.2435" y2="785.89" gradientTransform="matrix(1 0 0 1 -15.74 -735.83)">
+		<stop  offset="0" style="stop-color:#A5CE43"/>
+		<stop  offset="1" style="stop-color:#8EC744"/>
+	</linearGradient>
+	<path class="st3" d="M43.4,22.2c-0.6-2.3-1.7-4.5-3.2-6.4c0-0.1,0.1-0.3,0.1-0.4c0.1-0.2,0.1-0.5,0.1-0.7c0-2-1.6-3.6-3.6-3.6
+		c-2,0-3.6,1.6-3.6,3.6s1.6,3.6,3.6,3.6c0.2,0,0.5,0,0.7-0.1c4.7,6.1,3.5,14.8-2.5,19.4c-0.6,0.5-1.3,0.9-2,1.3v13.5l1-0.3
+		c0.9-0.3,1.8-0.6,2.8-1V40.7C42.6,36.5,45.2,29.1,43.4,22.2z"/>
+	
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="54.7871" y1="752.5" x2="54.7871" y2="785.89" gradientTransform="matrix(1 0 0 1 -15.74 -735.83)">
+		<stop  offset="0" style="stop-color:#A5CE43"/>
+		<stop  offset="1" style="stop-color:#8EC744"/>
+	</linearGradient>
+	<path class="st4" d="M47.5,42.9c9-11.6,6.9-28.3-4.6-37.3C38.2,2,32.5,0,26.5,0c-0.5,0-1.1,0-1.6,0l0,0v22.2l0,0
+		c0.5-0.2,1.1-0.3,1.7-0.4h0.1c2.6,0,4.7,2.1,4.7,4.7c0,0,0,0,0,0l0,0v0.1H35c0-3.9-2.7-7.3-6.5-8.2V3.7c12.7,1.1,22,12.2,21,24.9
+		c-0.4,4.4-2,8.6-4.7,12.1l0,0c-1.9-0.3-3.7,1.1-4,3c0,0.2,0,0.3,0,0.5c0,2,1.6,3.6,3.5,3.6c0,0,0,0,0,0l0,0c2,0,3.5-1.6,3.5-3.6
+		c0-0.3-0.1-0.7-0.2-1C47.6,43.1,47.6,43,47.5,42.9z"/>
+	<polygon class="st0" points="125.2,33.8 125.2,22.2 123.6,22.2 118.9,31.8 114.2,22.2 112.7,22.2 112.7,33.8 114.1,33.8 114.1,25 
+		118.4,33.8 119.5,33.8 123.8,25 123.8,33.8 	"/>
+	<path class="st5" d="M98.8,26.4c-0.7-0.7-1.6-1.1-2.6-1.1c-0.5,0-0.9,0.1-1.3,0.3c-0.4,0.2-0.8,0.4-1.2,0.7v-0.9h-1.4v8.4h1.4V29
+		c0-0.7,0.2-1.3,0.7-1.8c0.9-0.9,2.5-0.9,3.4,0l0,0c0.4,0.5,0.7,1.1,0.7,1.8v4.8h1.3v-4.9C99.9,28,99.5,27,98.8,26.4"/>
+	<path class="st5" d="M80.7,31.5c-0.4,0.7-0.9,1.3-1.6,1.6c-0.7,0.4-1.5,0.6-2.3,0.6h-2v2.8h-1.3V25.4h3.3c1.2,0,2.3,0.4,3.1,1.2
+		C81.2,27.9,81.6,29.9,80.7,31.5 M74.8,32.5h1.9c0.8,0,1.6-0.3,2.2-0.9c0.6-0.5,0.9-1.3,0.9-2.1c0-0.8-0.3-1.5-0.9-2.1
+		c-0.6-0.6-1.4-0.8-2.2-0.8h-1.9L74.8,32.5z"/>
+	<path class="st5" d="M91.3,30c0-0.1,0-0.3,0-0.4c0.1-2.5-1.8-4.6-4.3-4.7s-4.6,1.8-4.7,4.3c-0.1,2.5,1.8,4.6,4.3,4.7
+		c0.1,0,0.1,0,0.2,0c1.6,0,3-0.8,3.9-2.1l-1-0.8c-0.6,1-1.7,1.6-2.8,1.6c-1.7,0.1-3.1-1.2-3.2-2.9c-0.1-1.7,1.2-3.1,2.9-3.2h0.3
+		c1.3,0,2.6,0.8,3,2.1c0,0,0,0.2,0,0.2h-5V30L91.3,30z"/>
+	<path class="st5" d="M70.8,28c0,2.6-2.1,4.7-4.7,4.7c-2.6,0-4.7-2.1-4.7-4.7s2.1-4.7,4.7-4.7c0,0,0,0,0,0l0,0
+		C68.7,23.3,70.8,25.4,70.8,28C70.8,28,70.8,28,70.8,28 M72.1,28c0-3.3-2.7-6-6-6c-3.3,0-6,2.7-6,6s2.7,6,6,6S72.1,31.3,72.1,28
+		L72.1,28"/>
+	<path class="st0" d="M110,30.3c0,1.2-1,2.2-2.2,2.2h-5v-4.4h5C109,28.2,110,29.2,110,30.3 M109.3,25.2c0,0.9-0.7,1.6-1.6,1.6h-4.8
+		v-3.3h4.8C108.5,23.5,109.3,24.3,109.3,25.2 M109.6,27.3c1.2-1.1,1.3-2.9,0.3-4.1c-0.5-0.6-1.3-1-2.1-1h-6.2v11.6h6.6
+		c1.9-0.1,3.4-1.8,3.2-3.7C111.2,28.9,110.6,27.9,109.6,27.3"/>
+</g>
+<g class="st6">
+	<path class="st7" d="M61.9,18.3l1.6-7.9H66c0.4,0,0.8,0,1,0.1c0.4,0.1,0.6,0.2,0.9,0.3c0.2,0.2,0.4,0.4,0.6,0.6
+		c0.1,0.3,0.2,0.6,0.2,0.9c0,0.4-0.1,0.8-0.4,1.1c-0.2,0.3-0.6,0.6-1.1,0.8c0.4,0.1,0.7,0.4,1,0.6s0.3,0.6,0.3,1
+		c0,0.4-0.1,0.8-0.4,1.2c-0.2,0.4-0.6,0.7-1,0.9c-0.4,0.2-0.9,0.3-1.4,0.3H61.9z M63.1,17.4h1.8c0.5,0,0.8,0,1,0
+		c0.3-0.1,0.6-0.2,0.8-0.3s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.5,0.2-0.7c0-0.4-0.1-0.6-0.3-0.8c-0.2-0.2-0.7-0.3-1.3-0.3h-2L63.1,17.4z
+		 M63.9,13.8h1.6c0.8,0,1.3-0.1,1.6-0.4c0.3-0.2,0.5-0.6,0.5-1.1c0-0.2-0.1-0.4-0.2-0.6c-0.1-0.2-0.2-0.3-0.4-0.4
+		c-0.2-0.1-0.5-0.1-1-0.1h-1.7L63.9,13.8z"/>
+	<path class="st7" d="M73,17.2c-0.7,0.8-1.4,1.2-2.1,1.2c-0.4,0-0.8-0.1-1.1-0.4c-0.3-0.3-0.4-0.6-0.4-0.9c0-0.2,0.1-0.7,0.2-1.2
+		l0.7-3.3h1l-0.8,3.6c-0.1,0.3-0.1,0.5-0.1,0.7c0,0.2,0.1,0.4,0.2,0.5c0.1,0.1,0.3,0.2,0.6,0.2c0.3,0,0.5-0.1,0.8-0.2
+		c0.3-0.1,0.5-0.3,0.7-0.5c0.2-0.2,0.3-0.5,0.5-0.8c0.1-0.2,0.2-0.5,0.3-1l0.5-2.5h1l-1.2,5.7h-0.9L73,17.2z"/>
+	<path class="st7" d="M75.2,18.3l1.2-5.7h1l-1.2,5.7H75.2z M76.6,11.5l0.2-1.1h1l-0.2,1.1H76.6z"/>
+	<path class="st7" d="M77.6,18.3l1.6-7.9h1l-1.6,7.9H77.6z"/>
+	<path class="st7" d="M82.4,17.5l-0.2,0.8c-0.2,0.1-0.5,0.1-0.7,0.1c-0.4,0-0.7-0.1-0.9-0.3c-0.2-0.1-0.3-0.3-0.3-0.6
+		c0-0.1,0-0.4,0.1-0.9l0.7-3.3h-0.8l0.2-0.8h0.8l0.3-1.4l1.1-0.7l-0.4,2.1h1l-0.2,0.8h-1l-0.7,3.2c-0.1,0.4-0.1,0.6-0.1,0.7
+		c0,0.1,0,0.2,0.1,0.3s0.2,0.1,0.3,0.1C82,17.6,82.2,17.5,82.4,17.5z"/>
+	<path class="st7" d="M86.4,16.1c0-1.1,0.3-2,1-2.8c0.5-0.6,1.3-0.9,2.1-0.9c0.7,0,1.2,0.2,1.7,0.6c0.4,0.4,0.6,1,0.6,1.7
+		c0,0.7-0.1,1.3-0.4,1.8c-0.3,0.6-0.6,1-1.1,1.3c-0.5,0.3-1,0.5-1.5,0.5c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.6-0.5-0.8-0.8
+		C86.5,17,86.4,16.6,86.4,16.1z M87.4,16c0,0.5,0.1,0.9,0.4,1.2s0.6,0.4,1,0.4c0.2,0,0.4,0,0.6-0.1s0.4-0.2,0.6-0.4
+		c0.2-0.2,0.3-0.4,0.4-0.6c0.1-0.2,0.2-0.5,0.3-0.7c0.1-0.4,0.2-0.7,0.2-1c0-0.5-0.1-0.9-0.4-1.2c-0.3-0.3-0.6-0.4-1-0.4
+		c-0.3,0-0.6,0.1-0.8,0.2c-0.3,0.1-0.5,0.4-0.7,0.6c-0.2,0.3-0.4,0.6-0.4,1C87.4,15.4,87.4,15.7,87.4,16z"/>
+	<path class="st7" d="M92.4,18.3l1.2-5.7h0.9l-0.2,1c0.4-0.4,0.7-0.7,1.1-0.9s0.7-0.3,1-0.3c0.5,0,0.8,0.1,1.1,0.4
+		c0.3,0.3,0.4,0.6,0.4,1c0,0.2,0,0.5-0.1,1l-0.7,3.5h-1l0.8-3.6c0.1-0.4,0.1-0.6,0.1-0.8c0-0.2-0.1-0.3-0.2-0.5s-0.3-0.2-0.6-0.2
+		c-0.5,0-0.9,0.2-1.3,0.5c-0.4,0.4-0.7,1-0.9,1.8l-0.6,2.7H92.4z"/>
+</g>
+</svg>
diff --git a/src/assets/images/openbmc-logo.svg b/src/assets/images/logo-login.svg
similarity index 100%
rename from src/assets/images/openbmc-logo.svg
rename to src/assets/images/logo-login.svg
diff --git a/src/components/AppHeader/AppHeader.vue b/src/components/AppHeader/AppHeader.vue
index 7f18e1d..4162add 100644
--- a/src/components/AppHeader/AppHeader.vue
+++ b/src/components/AppHeader/AppHeader.vue
@@ -25,7 +25,11 @@
           <icon-menu v-if="!isNavigationOpen" />
         </b-button>
         <b-navbar-nav>
-          <b-nav-text>{{ $t('appHeader.bmcSystemManagement') }}</b-nav-text>
+          <img
+            class="header-logo"
+            src="@/assets/images/logo-header.svg"
+            :alt="altLogo"
+          />
         </b-navbar-nav>
         <!-- Right aligned nav items -->
         <b-navbar-nav class="ml-auto helper-menu">
@@ -85,7 +89,8 @@
   },
   data() {
     return {
-      isNavigationOpen: false
+      isNavigationOpen: false,
+      altLogo: `${process.env.VUE_APP_COMPANY_NAME} logo`
     };
   },
   computed: {
@@ -192,6 +197,12 @@
       padding: $spacer / 2;
     }
 
+    .header-logo {
+      width: auto;
+      height: $header-height;
+      padding: $spacer/2 0;
+    }
+
     .helper-menu {
       @include media-breakpoint-down(sm) {
         background-color: gray('800');
diff --git a/src/env/router/intel.js b/src/env/router/intel.js
new file mode 100644
index 0000000..dccb2de
--- /dev/null
+++ b/src/env/router/intel.js
@@ -0,0 +1,6 @@
+import router from '@/router';
+
+// Use router.addRoutes() to add layer specific routes
+// https://router.vuejs.org/api/#router-addroutes
+
+export default router;
diff --git a/src/env/store/intel.js b/src/env/store/intel.js
new file mode 100644
index 0000000..70c9b98
--- /dev/null
+++ b/src/env/store/intel.js
@@ -0,0 +1,7 @@
+import store from '@/store';
+
+// Use store.registerModule() to register env specific
+// store modules
+// https://vuex.vuejs.org/api/#registermodule
+
+export default store;
diff --git a/src/layouts/LoginLayout.vue b/src/layouts/LoginLayout.vue
index 8dd741c..e92cf05 100644
--- a/src/layouts/LoginLayout.vue
+++ b/src/layouts/LoginLayout.vue
@@ -7,8 +7,8 @@
             <img
               class="logo"
               width="200px"
-              src="@/assets/images/openbmc-logo.svg"
-              alt=""
+              src="@/assets/images/logo-login.svg"
+              :alt="altLogo"
             />
             <h1>OpenBMC</h1>
           </div>
@@ -23,7 +23,12 @@
 
 <script>
 export default {
-  name: 'LoginLayout'
+  name: 'LoginLayout',
+  data() {
+    return {
+      altLogo: `${process.env.VUE_APP_META} logo`
+    };
+  }
 };
 </script>
 
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index e6c508b..c0f3043 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -62,7 +62,6 @@
   },
   "appHeader": {
     "applicationHeader": "Application header",
-    "bmcSystemManagement": "BMC System Management",
     "health": "Health",
     "logOut": "Log out",
     "power": "Power",