diff --git a/Step.Config/Config/serverConfig.xml b/Step.Config/Config/serverConfig.xml
index f1b79dd3..0a29d13c 100644
--- a/Step.Config/Config/serverConfig.xml
+++ b/Step.Config/Config/serverConfig.xml
@@ -10,6 +10,7 @@
     <sharedName>//PARTPRG:/</sharedName>
     <installationDate>01/01/2019</installationDate>
     <mgiOption>false</mgiOption>
+    <siemensKeyboardOption>true</siemensKeyboardOption>
   </ncConfig>
   <softwareProdConfig>
     <enabled>false</enabled>
diff --git a/Step.Config/Config/serverConfigValidator.xsd b/Step.Config/Config/serverConfigValidator.xsd
index cfc509bc..633994fc 100644
--- a/Step.Config/Config/serverConfigValidator.xsd
+++ b/Step.Config/Config/serverConfigValidator.xsd
@@ -15,6 +15,7 @@
               <xs:element name="sharedName" type="xs:string" minOccurs='1' maxOccurs='1'/>
               <xs:element name="installationDate" type="xs:string" minOccurs='1' maxOccurs='1'/>
               <xs:element name="mgiOption" type="xs:boolean" minOccurs='1' maxOccurs='1'/>
+              <xs:element name="siemensKeyboardOption" type="xs:boolean" minOccurs='1' maxOccurs='1'/>
             </xs:all>
           </xs:complexType>
         </xs:element>
diff --git a/Step.Config/ServerConfigController.cs b/Step.Config/ServerConfigController.cs
index 1421909c..42318e30 100644
--- a/Step.Config/ServerConfigController.cs
+++ b/Step.Config/ServerConfigController.cs
@@ -279,7 +279,8 @@ namespace Step.Config
                     SharedPath = x.Element("sharedPath").Value,
                     SharedName = x.Element("sharedName").Value,
                     InstallationDate = x.Element("installationDate").Value,
-                    MgiOption = Convert.ToBoolean(x.Element("mgiOption").Value)
+                    MgiOption = Convert.ToBoolean(x.Element("mgiOption").Value),
+                    SiemensKeyboardOption = Convert.ToBoolean(x.Element("siemensKeyboardOption").Value)
                 }).FirstOrDefault();
 
             // Read Prod Software Config with LINQ
@@ -309,7 +310,7 @@ namespace Step.Config
                     MTCApplicationName = x.Element("MTCApplicationName").Value,
                     MaxAlarmsRows = Convert.ToInt32(x.Element("maxAlarmsRows").Value),
                     AlarmToDelete = Convert.ToInt32(x.Element("alarmToDelete").Value),
-                    CmsConnectReady = Convert.ToBoolean(x.Element("CMSConnectReady").Value) 
+                    CmsConnectReady = Convert.ToBoolean(x.Element("CMSConnectReady").Value)
                 }).FirstOrDefault();
 
             int softwareId = 0;
diff --git a/Step.Model/ConfigModels/NcConfigModel.cs b/Step.Model/ConfigModels/NcConfigModel.cs
index 0c607c37..e8324679 100644
--- a/Step.Model/ConfigModels/NcConfigModel.cs
+++ b/Step.Model/ConfigModels/NcConfigModel.cs
@@ -18,5 +18,6 @@ namespace Step.Model.ConfigModels
         public string SharedName { get; set; }
         public string InstallationDate { get; set; }
         public bool MgiOption { get; set; }
+        public bool SiemensKeyboardOption { get; set; }
     }
 }
diff --git a/Step.Model/ConfigModels/ServerConfigModel.cs b/Step.Model/ConfigModels/ServerConfigModel.cs
index ac5a3920..ca5f6c7b 100644
--- a/Step.Model/ConfigModels/ServerConfigModel.cs
+++ b/Step.Model/ConfigModels/ServerConfigModel.cs
@@ -23,5 +23,7 @@ namespace Step.Model.ConfigModels
 
         public int MaxAlarmsRows { get; set; }
         public int AlarmToDelete { get; set; }
+
+        public bool SiemensKeyboardOption { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Step.Model/DTOModels/DTOClientConfigurationModel.cs b/Step.Model/DTOModels/DTOClientConfigurationModel.cs
index 42d7ac88..40132909 100644
--- a/Step.Model/DTOModels/DTOClientConfigurationModel.cs
+++ b/Step.Model/DTOModels/DTOClientConfigurationModel.cs
@@ -17,6 +17,8 @@ namespace Step.Model.DTOModels
         public bool Autorun { get; set; }
         public bool MgiOption { get; set; }
         public bool CmsConnectReady { get; set; }
+        public bool SiemensKeyboardOption { get; set; }
+
         public List<ExtSoftwareModel> ExtSoftwares { get; set; }
 
         public CultureInfo DefaultLanguage
diff --git a/Step/Controllers/WebApi/ConfigurationController.cs b/Step/Controllers/WebApi/ConfigurationController.cs
index ec8934f8..d2f725b1 100644
--- a/Step/Controllers/WebApi/ConfigurationController.cs
+++ b/Step/Controllers/WebApi/ConfigurationController.cs
@@ -49,7 +49,8 @@ namespace Step.Controllers.WebApi
                 EditorPath = ServerStartupConfig.TextEditorPath,
                 MgiOption = NcConfig.MgiOption,
                 //CmsConnectReady = CmsConnectConfig.Enabled
-                CmsConnectReady = ServerStartupConfig.CmsConnectReady
+                CmsConnectReady = ServerStartupConfig.CmsConnectReady,
+                SiemensKeyboardOption = NcConfig.SiemensKeyboardOption
             };
 
             return Ok(clientConfiguration);
diff --git a/Step/wwwroot/assets/styles/base/head.less b/Step/wwwroot/assets/styles/base/head.less
index 3d8ae22d..5df3ea4f 100644
--- a/Step/wwwroot/assets/styles/base/head.less
+++ b/Step/wwwroot/assets/styles/base/head.less
@@ -602,6 +602,15 @@
     right: -12px;
 }
 
+.siemens-keyboard-head-style {
+    width: 828px !important;
+    right: 0px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    flex-wrap: nowrap;
+    height: 132px;
+}
+
 .head-production{
     max-width: 530px;
     width: 530px;
diff --git a/Step/wwwroot/assets/styles/base/plc-softkeys.less b/Step/wwwroot/assets/styles/base/plc-softkeys.less
index 5dd8655f..2157d0d9 100644
--- a/Step/wwwroot/assets/styles/base/plc-softkeys.less
+++ b/Step/wwwroot/assets/styles/base/plc-softkeys.less
@@ -204,6 +204,10 @@
     }
 }
 
+.siemens-keyboard-style {
+    height: 650px !important;
+}
+
 .soft-key {
     cursor: pointer;
     // &.menuopened:after{
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index 6fcc7a5a..467c80e3 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -6007,6 +6007,9 @@ footer .container button.big:before {
   align-items: center;
   justify-content: flex-end;
 }
+.siemens-keyboard-style {
+  height: 650px !important;
+}
 .soft-key {
   cursor: pointer;
   position: relative;
@@ -7364,6 +7367,14 @@ footer .container button.big:before {
 .heads-container-lt4 {
   right: -12px;
 }
+.siemens-keyboard-head-style {
+  width: 828px !important;
+  right: 0px;
+  overflow-x: auto;
+  overflow-y: hidden;
+  flex-wrap: nowrap;
+  height: 132px;
+}
 .head-production {
   max-width: 530px;
   width: 530px;
diff --git a/Step/wwwroot/src/app.business-logic.ts b/Step/wwwroot/src/app.business-logic.ts
index 0f0125a1..595d2caf 100644
--- a/Step/wwwroot/src/app.business-logic.ts
+++ b/Step/wwwroot/src/app.business-logic.ts
@@ -97,10 +97,10 @@ async function loadMachineConfig() {
 
     // set vendor type
     switch (vendor) {
-      case "siemens": machineInfoActions.updateMachineInfo(store, { isSiemens: true, isFanuc: false, isOsai: false, defaultLanguage: mcresult.defaultLanguage, isSCMVisualStyle: isSCM, mgiOption : false, cmsConnectReady: mcresult.cmsConnectReady }); break;
-      case "fanuc": machineInfoActions.updateMachineInfo(store, { isSiemens: false, isFanuc: true, isOsai: false, defaultLanguage: mcresult.defaultLanguage, isSCMVisualStyle: isSCM, mgiOption: mcresult.mgiOption, cmsConnectReady: mcresult.cmsConnectReady }); break;
-      case "osai": machineInfoActions.updateMachineInfo(store, { isSiemens: false, isFanuc: false, isOsai: true, defaultLanguage: mcresult.defaultLanguage, isSCMVisualStyle: isSCM, mgiOption: false, cmsConnectReady: mcresult.cmsConnectReady }); break;
-      default: machineInfoActions.updateMachineInfo(store, { isSiemens: false, isFanuc: false, isOsai: false, defaultLanguage: mcresult.defaultLanguage, isSCMVisualStyle: isSCM, cmsConnectReady: mcresult.cmsConnectReady }); break;
+      case "siemens": machineInfoActions.updateMachineInfo(store, { isSiemens: true, isFanuc: false, isOsai: false, defaultLanguage: mcresult.defaultLanguage, isSCMVisualStyle: isSCM, mgiOption : false, cmsConnectReady: mcresult.cmsConnectReady, siemensKeyboardOption: mcresult.siemensKeyboardOption }); break;
+      case "fanuc": machineInfoActions.updateMachineInfo(store, { isSiemens: false, isFanuc: true, isOsai: false, defaultLanguage: mcresult.defaultLanguage, isSCMVisualStyle: isSCM, mgiOption: mcresult.mgiOption, cmsConnectReady: mcresult.cmsConnectReady, siemensKeyboardOption: false }); break;
+      case "osai": machineInfoActions.updateMachineInfo(store, { isSiemens: false, isFanuc: false, isOsai: true, defaultLanguage: mcresult.defaultLanguage, isSCMVisualStyle: isSCM, mgiOption: false, cmsConnectReady: mcresult.cmsConnectReady, siemensKeyboardOption: false }); break;
+      default: machineInfoActions.updateMachineInfo(store, { isSiemens: false, isFanuc: false, isOsai: false, defaultLanguage: mcresult.defaultLanguage, isSCMVisualStyle: isSCM, cmsConnectReady: mcresult.cmsConnectReady, siemensKeyboardOption: false }); break;
     }
 
     machineInfoActions.updateMachineInfo(store, { clientDefaultLanguage: mcresult.defaultLanguage });
diff --git a/Step/wwwroot/src/app_modules/production/components/card-production-cms.ts b/Step/wwwroot/src/app_modules/production/components/card-production-cms.ts
index 56cf0275..e8e8175b 100644
--- a/Step/wwwroot/src/app_modules/production/components/card-production-cms.ts
+++ b/Step/wwwroot/src/app_modules/production/components/card-production-cms.ts
@@ -57,6 +57,10 @@ export default class CardProductionCms extends Vue {
   get canLoadProgram() {
     return this.$store.state.process.canLoadProgram;
   }
+  
+  get siemensKeyboardOption() {
+    return this.$store.state.machineInfo.siemensKeyboardOption;
+  }
 
   openModal() {
     ModalHelper.ShowModal(modalLoadProgram);
diff --git a/Step/wwwroot/src/app_modules/production/components/card-production-cms.vue b/Step/wwwroot/src/app_modules/production/components/card-production-cms.vue
index e7dfc8e6..2b355376 100644
--- a/Step/wwwroot/src/app_modules/production/components/card-production-cms.vue
+++ b/Step/wwwroot/src/app_modules/production/components/card-production-cms.vue
@@ -17,7 +17,7 @@
         <div class="overlay-noauto" v-if="!isSoftkeyKeySelected(1)">
             <div class="messsage">
                 <div>{{'production_label_select_auto_mode' | localize('Seleziona la modalità automatica per eseguire un programma')}}</div>
-                <button @click="ncSoftkeyClick(1)" :disabled="!isSoftkeyKeyKeyActive(1)" class="btn btn-success" ><img src="assets/icons/under-hood-png/automatic-blue@2x.png"> {{softkeyName(1)}}</button>
+                <button @click="ncSoftkeyClick(1)" v-if="!siemensKeyboardOption" :disabled="!isSoftkeyKeyKeyActive(1)" class="btn btn-success" ><img src="assets/icons/under-hood-png/automatic-blue@2x.png"> {{softkeyName(1)}}</button>
             </div>
         </div>
     </div>
diff --git a/Step/wwwroot/src/app_modules/production/components/production.vue b/Step/wwwroot/src/app_modules/production/components/production.vue
index 69d39452..e3e47727 100644
--- a/Step/wwwroot/src/app_modules/production/components/production.vue
+++ b/Step/wwwroot/src/app_modules/production/components/production.vue
@@ -34,7 +34,7 @@
                         <div class="setting-top">
                             <card-axes-production></card-axes-production>
                         </div>
-                        <div class="setting-bottom">
+                        <div class="setting-bottom" v-if="!machineInfo.siemensKeyboardOption">
                             <button v-if="!machineInfo.isOsai" @click="ncClick(14)" :disabled="!isKeyActive(14)" :class="{active:isKeySelected(14) , inverted:isReadOnly(14)}" class="soft icon"><img src="assets/icons/under-hood-png/blk-active.png" />{{name(14)}}</button>
                             <button @click="ncClick(15)" :disabled="!isKeyActive(15)" :class="{active:isKeySelected(15) , inverted:isReadOnly(15)}" class="soft icon"><img src="assets/icons/under-hood-png/blk-del-active.png" />{{name(15)}}</button>
                             <button @click="ncClick(16)" :disabled="!isKeyActive(16)" :class="{active:isKeySelected(16) , inverted:isReadOnly(16)}" class="soft icon"><img src="assets/icons/under-hood-png/OpStop-active.png" />{{name(16)}}</button>
diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.ts b/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.ts
index 6ce2a3d7..af4cf0f4 100644
--- a/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.ts
+++ b/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.ts
@@ -9,6 +9,7 @@ import { DataService } from "src/services/dataService";
 import onOffSoftKey from "./soft-key2.vue";
 import procedureSoftKey from "./soft-key3.vue";
 import groupSoftKey from "./soft-key1.vue";
+import { Prop } from "vue-property-decorator";
 
 
 @Componet({
@@ -16,6 +17,9 @@ import groupSoftKey from "./soft-key1.vue";
 })
 export default class softKeys extends Vue {
 
+  @Prop({ default: false })
+  public siemensKeyboardOption: boolean;
+
   public maxNumberSelected: number = 10;
 
   public selectedSection: number = 1;
diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.vue b/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.vue
index c1ead884..5f12fac7 100644
--- a/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.vue
+++ b/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="plc-softkeys-container">
+  <div id="plc-softkeys-container" :class="{'siemens-keyboard-style': siemensKeyboardOption}">
   <div class="container" :class="{waiting : waitingForStart || disabled}">
     <header >
       <button v-if="isSectionVisible(1)" :class="{active:selectedSection==1}" @click="selectSection(1)" :title="'sfk_category_1' | localize('sfk_category_1')"><img src="assets/icons/under-hood-png/cat-1.png"></button>
diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.ts b/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.ts
index 70f3690f..12afafb5 100644
--- a/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.ts
+++ b/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.ts
@@ -53,6 +53,9 @@ export default {
     processes: function() {
       return this.$store.state.process.process;
     },
+    siemensKeyboardOption() {
+      return this.$store.state.machineInfo.siemensKeyboardOption;
+    }
   },
   methods: {
     toggleMainView() {
diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.vue b/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.vue
index 231777b2..045b94f4 100644
--- a/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.vue
+++ b/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.vue
@@ -14,12 +14,12 @@
       </div >
       </div>
       <div class="keys-area">
-        <nc-soft-keys></nc-soft-keys>
+        <nc-soft-keys v-if="!siemensKeyboardOption"></nc-soft-keys>
         <axes-soft-keys v-if="showAxisBtn"></axes-soft-keys>
         <mheads></mheads>
-        <jog-menu v-if="showJog"></jog-menu>
-        <auto-menu v-if="showAuto"></auto-menu>
-        <plc-soft-keys></plc-soft-keys>
+        <jog-menu v-if="!siemensKeyboardOption && showJog"></jog-menu>
+        <auto-menu v-if="!siemensKeyboardOption && showAuto"></auto-menu>
+        <plc-soft-keys :siemensKeyboardOption="siemensKeyboardOption"></plc-soft-keys>
       </div>
     </div>
 </template>
diff --git a/Step/wwwroot/src/modules/mheads.vue b/Step/wwwroot/src/modules/mheads.vue
index a573c991..70a82863 100644
--- a/Step/wwwroot/src/modules/mheads.vue
+++ b/Step/wwwroot/src/modules/mheads.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="heads-container scrollable_auto" :class="{'mini':(heads.length <=2) , 'heads-container-lt4':(heads.length <=4)}">
+<div class="heads-container scrollable_auto" :class="{'mini':(heads.length <=2) , 'heads-container-lt4':(heads.length <=4), 'siemens-keyboard-head-style': siemensKeyboardOption }">
   <head-std :title="'head_' + h.id | localize(h.name)" v-for="h in heads" :key="h.id"
             :rpm="getHeadsProperty(h.id).actualSpeed"
             :tool="getHeadsProperty(h.id).mountedTool"
@@ -25,13 +25,8 @@
             :familyId="getHeadsFamilyId(h.id)" 
             @overridePlus="overridePlus(h.id)" @overrideMinus="overrideMinus(h.id)"
             ></head-std>
-   <div class="head-place-holder" v-if="heads.length <=1 || (heads.length>2 && heads.length%2)"></div>
-  <!-- <head-std :percentage="40" :load="55" :tool=1 :rpm=160000 title="head2"  process="1"></head-std>
-  <head-std :percentage="100" :load="65" :tool=2 title="head3"  process="1"></head-std>
-  <head-std title="head4" :load="100" process="1"></head-std>
-  <head-spindle title="head5" :load="100" process="1" tool="E54"></head-spindle>
-  <head-awj title="head4" :load="100" process="1"  tool="E54"></head-awj>
-  <head-awj class="selected" title="head4" :load="100" process="1"  tool="E54"></head-awj> -->
+   <div class="head-place-holder" v-if="!siemensKeyboardOption && (heads.length <=1 || (heads.length>2 && heads.length%2))"></div>
+   
 </div>
 </template>
 <script>
@@ -43,6 +38,9 @@ export default {
   computed: {
     heads: function() {
       return this.$store.state.machineInfo.heads;
+    },   
+    siemensKeyboardOption: function() {
+      return this.$store.state.machineInfo.siemensKeyboardOption;
     }
   },
   methods: {
diff --git a/Step/wwwroot/src/services/machineService.ts b/Step/wwwroot/src/services/machineService.ts
index 7e709672..55ef65d1 100644
--- a/Step/wwwroot/src/services/machineService.ts
+++ b/Step/wwwroot/src/services/machineService.ts
@@ -26,7 +26,6 @@ export class machineService extends baseRestService {
     if (result) {
       machineInfoActions.updateMachineInfo(store, {
         defaultLanguage: result.language,
-
         machineName: result.machineModel,
         firmwareVersion: result.ncSoftwareVersion,
         machineSerialNumber: result.cmsMachineIdNumber,
@@ -53,7 +52,8 @@ export interface ClientConfigurationModel {
   showHMI: boolean,
   defaultLanguage: string,
   mgiOption: boolean,
-  cmsConnectReady: boolean
+  cmsConnectReady: boolean,
+  siemensKeyboardOption: boolean
 }
 
 export interface ContactConfigurationModel {
diff --git a/Step/wwwroot/src/store/machineInfo.store.ts b/Step/wwwroot/src/store/machineInfo.store.ts
index e111c45b..3d74042f 100644
--- a/Step/wwwroot/src/store/machineInfo.store.ts
+++ b/Step/wwwroot/src/store/machineInfo.store.ts
@@ -24,6 +24,7 @@ export interface MachineInfoModel {
   canChangePages?: boolean,
   isSCMVisualStyle?: boolean,
   cmsConnectReady?: boolean,
+  siemensKeyboardOption?: boolean
 
   defaultLanguage?: string,
   clientDefaultLanguage?: string,
@@ -78,8 +79,8 @@ export const machineInfoStore = {
     defaultLanguage: "en",
     clientDefaultLanguage: "en",
     softkeysFavorites: [],
-    _softkeysFavorites: new Map<number, SoftKeysConfigurationModel>()
-
+    _softkeysFavorites: new Map<number, SoftKeysConfigurationModel>(),
+    siemensKeyboardOption: false
   } as MachineInfoModel,
   getters: {
     getNcSoftKeyInfo: state => id => {