diff --git a/templates/macros/table/config/home.jinja b/templates/macros/table/config/home.jinja
index 3d2f24ebe7ca1bdf6a1d203e91b258ab5e691bec..4b05d8986261508656a128cd8bdcb41bb1e26d0e 100644
--- a/templates/macros/table/config/home.jinja
+++ b/templates/macros/table/config/home.jinja
@@ -423,7 +423,6 @@
                 "input": {
                   "type": "select",
                   "options": {
-                    "group": "kube",
                     "enabled": true
                   }
                 },
diff --git a/templates/macros/table/config/workshop.jinja b/templates/macros/table/config/workshop.jinja
index c8ce3bf1f53081218b087640b2ec5625e3795458..5309d260afbd9cb4c3ef522a480b8a02b372b46b 100644
--- a/templates/macros/table/config/workshop.jinja
+++ b/templates/macros/table/config/workshop.jinja
@@ -423,7 +423,6 @@
                 "input": {
                   "type": "select",
                   "options": {
-                    "group": "kube",
                     "enabled": true
                   }
                 },
diff --git a/templates/macros/table/config/workshop_manager.jinja b/templates/macros/table/config/workshop_manager.jinja
index 2602a84c489676640b676bbebb748bb8df7524ae..29c6bfcdd8a09ba47f36d5d2cdf121fed1a7a31f 100644
--- a/templates/macros/table/config/workshop_manager.jinja
+++ b/templates/macros/table/config/workshop_manager.jinja
@@ -715,7 +715,6 @@
                 "input": {
                   "type": "select",
                   "options": {
-                    "group": "kube",
                     "enabled": false
                   }
                 },
diff --git a/templates/macros/table/table_js.jinja b/templates/macros/table/table_js.jinja
index cf95279f957def9de4fdffe05200646e869b9c2e..64c047426ee881ee6487fdc5a09555bfd3d2d0f6 100644
--- a/templates/macros/table/table_js.jinja
+++ b/templates/macros/table/table_js.jinja
@@ -19,7 +19,7 @@
   const backendServicesConfig = {{ custom_config.backendServices | tojson }};
 
   const notAllowedKeys = ["secret_keys", "defaultvalues", "attachvalues"];
-  const mappingDict = {}
+  const mappingDict = {};
   const globalUserOptions = {};
   const globalFillingOrder = {};
 
@@ -1213,8 +1213,8 @@
     {# WorkshopManager.default.kube.flavor --> #}
       function homeTriggerFlavor(trigger, serviceId, rowId, tabId, elementId, elementOptions) {
         const systems = val(getInputElement(serviceId, rowId, "system"));
-        const systemTypes = getSystemTypes(serviceId, rowId);
-        if ( systemTypes.includes("kube") ){
+
+        if ( systems.some(item => kubeSystems.includes(item)) ) {
           const selectInput = getInputElement(serviceId, rowId, "flavor");
           fillSelect(elementId, selectInput, getAvailableKubeFlavorsS(systems), {}, getUnavailableKubeFlavorsS(systems), "maximum reached");
           // selectInput.trigger("change");
@@ -1317,8 +1317,8 @@
 
       function homeTriggerFlavorInfo(trigger, serviceId, rowId, tabId, elementId, elementOptions) {
         const systems = val(getInputElement(serviceId, rowId, "system"));
-        const systemTypes = getSystemTypes(serviceId, rowId);      
-        if ( systemTypes.includes("kube") && systems.length == 1 ){
+
+        if ( systems.some(item => kubeSystems.includes(item)) && systems.length == 1 ){
           setFlavorInfo(serviceId, rowId, systems[0]);
           // $(`[id^='${serviceId}-${rowId}-'][id$='-flavorinfo-info-div']`).show();
         }