diff --git a/src/views/Overview/OverviewFirmware.vue b/src/views/Overview/OverviewFirmware.vue
index f1f9ce5..c2c7f4a 100644
--- a/src/views/Overview/OverviewFirmware.vue
+++ b/src/views/Overview/OverviewFirmware.vue
@@ -4,7 +4,7 @@
     :to="`/operations/firmware`"
   >
     <b-row class="mt-3">
-      <b-col>
+      <b-col sm="6">
         <dl>
           <dt>{{ $t('pageOverview.runningVersion') }}</dt>
           <dd>{{ dataFormatter(runningVersion) }}</dd>
@@ -12,6 +12,12 @@
           <dd>{{ dataFormatter(backupVersion) }}</dd>
         </dl>
       </b-col>
+      <b-col sm="6">
+        <dl>
+          <dt>{{ $t('pageOverview.firmwareVersion') }}</dt>
+          <dd>{{ dataFormatter(firmwareVersion) }}</dd>
+        </dl>
+      </b-col>
     </b-row>
   </overview-card>
 </template>
@@ -19,6 +25,7 @@
 <script>
 import OverviewCard from './OverviewCard';
 import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+import { mapState } from 'vuex';
 
 export default {
   name: 'Firmware',
@@ -27,18 +34,24 @@
   },
   mixins: [DataFormatterMixin],
   computed: {
-    backupBmcFirmware() {
-      return this.$store.getters['firmware/backupBmcFirmware'];
-    },
-    backupVersion() {
-      return this.backupBmcFirmware?.version;
-    },
-    activeBmcFirmware() {
-      return this.$store.getters[`firmware/activeBmcFirmware`];
-    },
-    runningVersion() {
-      return this.activeBmcFirmware?.version;
-    },
+    ...mapState({
+      server: (state) => state.system.systems[0],
+      backupBmcFirmware() {
+        return this.$store.getters['firmware/backupBmcFirmware'];
+      },
+      backupVersion() {
+        return this.backupBmcFirmware?.version;
+      },
+      activeBmcFirmware() {
+        return this.$store.getters[`firmware/activeBmcFirmware`];
+      },
+      firmwareVersion() {
+        return this.server?.firmwareVersion;
+      },
+      runningVersion() {
+        return this.activeBmcFirmware?.version;
+      },
+    }),
   },
   created() {
     this.$store.dispatch('firmware/getFirmwareInformation').finally(() => {
diff --git a/src/views/Overview/OverviewServer.vue b/src/views/Overview/OverviewServer.vue
index d066d39..8fc16d1 100644
--- a/src/views/Overview/OverviewServer.vue
+++ b/src/views/Overview/OverviewServer.vue
@@ -4,7 +4,7 @@
     :to="`/hardware-status/inventory`"
   >
     <b-row class="mt-3">
-      <b-col lg="6">
+      <b-col sm="6">
         <dl>
           <dt>{{ $t('pageOverview.model') }}</dt>
           <dd>{{ dataFormatter(serverModel) }}</dd>
@@ -12,6 +12,12 @@
           <dd>{{ dataFormatter(serverSerialNumber) }}</dd>
         </dl>
       </b-col>
+      <b-col sm="6">
+        <dl>
+          <dt>{{ $t('pageOverview.serverManufacturer') }}</dt>
+          <dd>{{ dataFormatter(serverManufacturer) }}</dd>
+        </dl>
+      </b-col>
     </b-row>
   </overview-card>
 </template>
@@ -36,6 +42,9 @@
       serverSerialNumber() {
         return this.server?.serialNumber;
       },
+      serverManufacturer() {
+        return this.server?.manufacturer;
+      },
     }),
   },
   created() {