diff --git a/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/ClientInstaller.java b/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/ClientInstaller.java
index 77179a2879c605c115ccbad407bd6c3b40cbac61..b92c75c515110cf35f34e63a76a96af473a4d7bc 100644
--- a/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/ClientInstaller.java
+++ b/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/ClientInstaller.java
@@ -64,7 +64,7 @@ public class ClientInstaller implements InitializingBean {
         if (baguetteServer.getNodeRegistry().getCoordinator()==null)
             throw new IllegalStateException("Baguette Server Coordinator has not yet been initialized");
 
-        if ("VM".equalsIgnoreCase(task.getType())) {
+        if ("VM".equalsIgnoreCase(task.getType()) || "baremetal".equalsIgnoreCase(task.getType())) {
             NodeRegistryEntry entry = baguetteServer.getNodeRegistry().getNodeByAddress(task.getAddress());
             if (entry==null)
                 throw new IllegalStateException("Node entry has been removed from Node Registry before installation: Node IP address: "+task.getAddress());
diff --git a/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/InstallationHelperFactory.java b/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/InstallationHelperFactory.java
index f7f5f0f6b4b4ec3f7b0d35ae4e7c3fa5d07387c3..3584bf3703a9bec98d59a753e3590df4f03082a3 100644
--- a/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/InstallationHelperFactory.java
+++ b/event-management/baguette-client-install/src/main/java/eu/melodic/event/baguette/client/install/helper/InstallationHelperFactory.java
@@ -39,7 +39,7 @@ public class InstallationHelperFactory implements InitializingBean {
 
     public InstallationHelper createInstallationHelper(NodeRegistryEntry entry) {
         String nodeType = entry.getPreregistration().get("type");
-        if ("VM".equalsIgnoreCase(nodeType)) {
+        if ("VM".equalsIgnoreCase(nodeType) || "baremetal".equalsIgnoreCase(nodeType)) {
             return createVmInstallationHelper(entry);
         }
         throw new IllegalArgumentException("Unsupported or missing Node type: "+nodeType);