diff --git a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java
index ffb8ceb0c986fe4a93bcb00d41cdb67e76be714e..601342623325d2680d05f8c7205c1e8dedc67a6a 100644
--- a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java
+++ b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java
@@ -873,11 +873,17 @@ public class PAGateway {
             newDeployment.setDeploymentType(NodeType.BYON);
             newDeployment.setByonNode(byonNode);
 
+            SSHCredentials sshCred = new SSHCredentials();
+            sshCred.setUsername(byonNode.getLoginCredential().getUsername());
+            sshCred.setUsername(byonNode.getLoginCredential().getPassword());
+            sshCred.setUsername(byonNode.getLoginCredential().getPrivateKey());
+
             PACloud cloud = new PACloud();
             String nodeSourceName = "BYON_NS_" + byonNode.getId();
             cloud.setCloudID(nodeSourceName);
             cloud.setNodeSourceNamePrefix(nodeSourceName);
             cloud.setCloudType(CloudType.BYON);
+            cloud.setSshCredentials(sshCred);
             cloud.addDeployment(newDeployment);
             newDeployment.setPaCloud(cloud);
             EntityManagerHelper.persist(cloud);
@@ -926,11 +932,17 @@ public class PAGateway {
             newDeployment.setDeploymentType(NodeType.EDGE);
             newDeployment.setEdgeNode(edgeNode);
 
+            SSHCredentials sshCred = new SSHCredentials();
+            sshCred.setUsername(edgeNode.getLoginCredential().getUsername());
+            sshCred.setUsername(edgeNode.getLoginCredential().getPassword());
+            sshCred.setUsername(edgeNode.getLoginCredential().getPrivateKey());
+
             PACloud cloud = new PACloud();
             String nodeSourceName = "EDGE_"+edgeNode.getSystemArch()+"_NS_" + edgeNode.getId();
             cloud.setCloudID(nodeSourceName);
             cloud.setNodeSourceNamePrefix(nodeSourceName);
             cloud.setCloudType(CloudType.EDGE);
+            cloud.setSshCredentials(sshCred);
             cloud.addDeployment(newDeployment);
             newDeployment.setPaCloud(cloud);
             EntityManagerHelper.persist(cloud);
diff --git a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/service/TaskBuilder.java b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/service/TaskBuilder.java
index 3d964d5b1e0ec1f95022c5669b94ee2628b8bb29..73b65f2a6334242ebd01a78c2432755eef0e8ab0 100644
--- a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/service/TaskBuilder.java
+++ b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/service/TaskBuilder.java
@@ -148,7 +148,8 @@ public class TaskBuilder {
             case IAAS:
                 return createInfraIAASTask(task, deployment, taskNameSuffix, nodeToken);
             case BYON:
-                return createInfraBYONTask(task, deployment, taskNameSuffix, nodeToken);
+            case EDGE:
+                return createInfraBYONandEDGETask(task, deployment, taskNameSuffix, nodeToken);
         }
 
         return new ScriptTask();
@@ -268,10 +269,12 @@ public class TaskBuilder {
         return new ScriptTask();
     }
 
-    private ScriptTask createInfraBYONTask(Task task, Deployment deployment, String taskNameSuffix, String nodeToken) {
-        LOGGER.debug("Acquiring node BYON script file: " + getClass().getResource(File.separator + "acquire_node_BYON_script.groovy").toString());
-        ScriptTask deployNodeTask = PAFactory.createGroovyScriptTaskFromFile("acquireBYONNode_" + task.getName() + taskNameSuffix,
-                                                                             "acquire_node_BYON_script.groovy");
+    private ScriptTask createInfraBYONandEDGETask(Task task, Deployment deployment, String taskNameSuffix, String nodeToken) {
+        String nodeType = deployment.getDeploymentType().getName();
+        System.out.println("the nodeType name is: "+ nodeType);
+        LOGGER.debug("Acquiring node " + nodeType + " script file: " + getClass().getResource(File.separator + "acquire_node_BYON_script.groovy").toString());
+        ScriptTask deployNodeTask = PAFactory.createGroovyScriptTaskFromFile("acquire"+nodeType+"Node_" + task.getName() + taskNameSuffix,
+                "acquire_node_BYON_script.groovy");
 
         deployNodeTask.setPreScript(PAFactory.createSimpleScriptFromFIle("pre_acquire_node_script.groovy", "groovy"));