diff --git a/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/VmInstallationHelper.java b/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/VmInstallationHelper.java
index d5ebe2503c793243d4009dd26ee23baa3dc6c28f..c418fa247934682b5e79bc6c6f7e8c11ba56ba38 100644
--- a/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/VmInstallationHelper.java
+++ b/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/VmInstallationHelper.java
@@ -68,9 +68,7 @@ public class VmInstallationHelper extends AbstractInstallationHelper {
 
         // Extract node identification and type information
         String nodeId = nodeMap.get("id");
-        String nodeOs = StringUtils.isNotBlank(nodeMap.get("operatingSystem.name"))
-                ? nodeMap.get("operatingSystem.name")
-                : nodeMap.get("operatingSystem");
+        String nodeOs = nodeMap.get("operatingSystem");
         String nodeAddress = nodeMap.get("address");
         String nodeType = nodeMap.get("type");
         String nodeName = nodeMap.get("name");
diff --git a/event-management/control-service/src/main/java/eu/melodic/event/control/ControlServiceController.java b/event-management/control-service/src/main/java/eu/melodic/event/control/ControlServiceController.java
index 4cd1f445b5b860d5d000f9a05f0e00de5016ec64..96a3e63c1f54fc587d2ecec8ed5c0a39158cecc3 100644
--- a/event-management/control-service/src/main/java/eu/melodic/event/control/ControlServiceController.java
+++ b/event-management/control-service/src/main/java/eu/melodic/event/control/ControlServiceController.java
@@ -405,7 +405,7 @@ public class ControlServiceController {
             return "ERROR "+e.getMessage();
         }
 
-        // Update client registration info with BASE_URL, IP_SETTING and CLIENT_ID
+        // Update client registration info with BASE_URL, IP_SETTING, CLIENT_ID and OS info
         updateRegistrationInfo(request, entry);
 
         // Continue processing according to ExecutionWare type
@@ -444,6 +444,12 @@ public class ControlServiceController {
         entry.getPreregistration().put("BASE_URL", baseUrl);
         entry.getPreregistration().put("CLIENT_ID", clientId);
         entry.getPreregistration().put("IP_SETTING", ipSetting);
+
+        // Set OS info
+        String os = StringUtils.isNotBlank(entry.getPreregistration().get("operatingSystem.name"))
+                ? entry.getPreregistration().get("operatingSystem.name")
+                : entry.getPreregistration().get("operatingSystem");
+        entry.getPreregistration().put("operatingSystem", os);
     }
 
     // Retained for backward compatibility with Cloudiator