diff --git a/sal-service/src/main/java/org/ow2/proactive/sal/service/nc/NodeCandidateUtils.java b/sal-service/src/main/java/org/ow2/proactive/sal/service/nc/NodeCandidateUtils.java
index 65ce8ee..1664349 100644
--- a/sal-service/src/main/java/org/ow2/proactive/sal/service/nc/NodeCandidateUtils.java
+++ b/sal-service/src/main/java/org/ow2/proactive/sal/service/nc/NodeCandidateUtils.java
@@ -183,6 +183,10 @@ private static boolean satisfyAttributeRequirement(AttributeRequirement attribut
                                            .compare(nodeCandidate.getCloud().getCloudType().name(),
                                                     attributeRequirement.getValue());
             }
+            if (attributeRequirement.getRequirementAttribute().equals("id")) {
+                return attributeRequirement.getRequirementOperator().compare(nodeCandidate.getCloud().getId(),
+                                                                             attributeRequirement.getValue());
+            }
         }
         if (attributeRequirement.getRequirementClass().toLowerCase(Locale.ROOT).equals("environment")) {
             if (attributeRequirement.getRequirementAttribute().equals("runtime")) {
diff --git a/sal-service/src/main/java/org/ow2/proactive/sal/service/service/ClusterService.java b/sal-service/src/main/java/org/ow2/proactive/sal/service/service/ClusterService.java
index 09a5809..8b7815b 100644
--- a/sal-service/src/main/java/org/ow2/proactive/sal/service/service/ClusterService.java
+++ b/sal-service/src/main/java/org/ow2/proactive/sal/service/service/ClusterService.java
@@ -274,15 +274,19 @@ public Cluster scaleInCluster(String sessionId, String clusterName, List<String>
             throw new NotConnectedException();
         }
         LOGGER.info("scaleDownCluster endpoint is called for the cluster: " + clusterName);
-        Cluster toScaleCluster = getCluster(sessionId, clusterName);
+        Cluster toScaleCluster = ClusterUtils.getClusterByName(clusterName, repositoryService.listCluster());
         repositoryService.deleteCluster(toScaleCluster);
         repositoryService.flush();
+        String masterNodeToken = "";
+        if (toScaleCluster != null) {
+            masterNodeToken = toScaleCluster.getMasterNode() + "_" + clusterName;
+        }
         List<ClusterNodeDefinition> clusterNodes = toScaleCluster.getNodes();
         for (String nodeName : nodesToDelete) {
             ClusterNodeDefinition node = getNodeFromCluster(toScaleCluster, nodeName);
             if (node != null && !node.getName().equals(toScaleCluster.getMasterNode())) {
                 try {
-                    if (deleteNode(sessionId, clusterName, node) != -1L) {
+                    if (deleteNode(sessionId, clusterName, node, masterNodeToken, true) != -1L) {
                         clusterNodes = deleteNodeFromCluster(clusterNodes, nodeName);
                     }
                 } catch (NotConnectedException e) {
@@ -326,7 +330,8 @@ public Long labelNodes(String sessionId, String clusterName, List<Map<String, St
                                                script,
                                                masterNodeToken,
                                                "label_nodes_" + clusterName,
-                                               "basic");
+                                               "basic",
+                                               "");
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -359,7 +364,8 @@ public Long deployApplication(String sessionId, String clusterName, ClusterAppli
                                                script,
                                                masterNodeToken,
                                                "deploy_app_" + clusterName,
-                                               "basic");
+                                               "basic",
+                                               "");
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -373,7 +379,7 @@ public boolean deleteCluster(String sessionId, String clusterName) throws NotCon
         Cluster toScaleCluster = getCluster(sessionId, clusterName);
         for (ClusterNodeDefinition node : toScaleCluster.getNodes()) {
             if (node != null) {
-                deleteNode(sessionId, clusterName, node);
+                deleteNode(sessionId, clusterName, node, "", false);
             }
         }
         repositoryService.deleteCluster(toScaleCluster);
@@ -403,13 +409,27 @@ private String getNodeUrl(String sessionId, String clusterName, ClusterNodeDefin
         return "";
     }
 
-    private Long deleteNode(String sessionId, String clusterName, ClusterNodeDefinition node)
-            throws NotConnectedException {
+    private Long deleteNode(String sessionId, String clusterName, ClusterNodeDefinition node, String masterNodeToken,
+            boolean drain) throws NotConnectedException {
         String nodeUrl = getNodeUrl(sessionId, clusterName, node);
         Long jobId = -1L;
         if (nodeUrl != null && !nodeUrl.isEmpty()) {
             try {
-                jobId = jobService.submitOneTaskJob(sessionId, nodeUrl, "", "delete_node_" + node.getName(), "delete");
+                if (drain) {
+                    jobId = jobService.submitOneTaskJob(sessionId,
+                                                        nodeUrl,
+                                                        masterNodeToken,
+                                                        "delete_node_" + node.getName(),
+                                                        "drain-delete",
+                                                        node.getNodeJobName(clusterName));
+                } else {
+                    jobId = jobService.submitOneTaskJob(sessionId,
+                                                        nodeUrl,
+                                                        masterNodeToken,
+                                                        "delete_node_" + node.getName(),
+                                                        "delete",
+                                                        "");
+                }
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
diff --git a/sal-service/src/main/java/org/ow2/proactive/sal/service/service/JobService.java b/sal-service/src/main/java/org/ow2/proactive/sal/service/service/JobService.java
index 318974a..5d44ff3 100644
--- a/sal-service/src/main/java/org/ow2/proactive/sal/service/service/JobService.java
+++ b/sal-service/src/main/java/org/ow2/proactive/sal/service/service/JobService.java
@@ -808,19 +808,27 @@ private void setAllReconfigurationMandatoryDependencies(TaskFlowJob paJob, Job j
         setAllMandatoryDependencies(paJob, job);
     }
 
-    public Long submitOneTaskJob(String sessionId, String script, String token, String jobName, String type)
-            throws NotConnectedException, IOException {
+    public Long submitOneTaskJob(String sessionId, String input, String token, String jobName, String type,
+            String nodeName) throws NotConnectedException, IOException {
         if (!paGatewayService.isConnectionActive(sessionId)) {
             throw new NotConnectedException();
         }
         TaskFlowJob paJob = new TaskFlowJob();
         paJob.setName(jobName);
-        LOGGER.info("Job created: " + paJob.toString());
+        LOGGER.info("Job created: " + paJob);
         try {
             if (Objects.equals(type, "basic")) {
-                paJob.addTask(taskBuilder.createOneNodeTask(script, token, jobName));
+                paJob.addTask(taskBuilder.createOneNodeTask(input, token, jobName));
             } else if (Objects.equals(type, "delete")) {
-                paJob.addTask(taskBuilder.createDeleteNodeTask(script));
+                paJob.addTask(taskBuilder.createDeleteNodeTask(input));
+            } else if (Objects.equals(type, "drain")) {
+                paJob.addTask(taskBuilder.createDrainNodeTask(input, token));
+            } else if (Objects.equals(type, "drain-delete")) {
+                ScriptTask parentTask = taskBuilder.createDrainNodeTask(nodeName, token);
+                ScriptTask childTask = taskBuilder.createDeleteNodeTask(input);
+                childTask.addDependence(parentTask);
+                paJob.addTask(parentTask);
+                paJob.addTask(childTask);
             } else {
                 LOGGER.error("type of submitOneTaskJob \"{}\" is not supported!", type);
                 throw new IOException();
diff --git a/sal-service/src/main/java/org/ow2/proactive/sal/service/service/ScalingService.java b/sal-service/src/main/java/org/ow2/proactive/sal/service/service/ScalingService.java
index 97ccdcb..2c6b19c 100644
--- a/sal-service/src/main/java/org/ow2/proactive/sal/service/service/ScalingService.java
+++ b/sal-service/src/main/java/org/ow2/proactive/sal/service/service/ScalingService.java
@@ -195,7 +195,7 @@ private void submitScalingOutJob(Job job, String scaledTaskName, List<Long> newN
         jobService.addCleanChannelsTaskWithDependencies(paJob, job);
 
         paJob.setMaxNumberOfExecution(2);
-        paJob.setProjectName("Morphemic");
+        paJob.setProjectName("NebulOuS");
 
         long submittedJobId = schedulerGateway.submit(paJob).longValue();
         job.setSubmittedJobId(submittedJobId);
@@ -374,7 +374,7 @@ private void submitScalingInJob(Job job, String scaledTaskName) {
         jobService.addCleanChannelsTaskWithDependencies(paJob, job);
 
         paJob.setMaxNumberOfExecution(2);
-        paJob.setProjectName("Morphemic");
+        paJob.setProjectName("NebulOuS");
 
         long submittedJobId = schedulerGateway.submit(paJob).longValue();
         job.setSubmittedJobId(submittedJobId);
diff --git a/sal-service/src/main/java/org/ow2/proactive/sal/service/service/TaskBuilder.java b/sal-service/src/main/java/org/ow2/proactive/sal/service/service/TaskBuilder.java
index 1abe0a0..243aa56 100644
--- a/sal-service/src/main/java/org/ow2/proactive/sal/service/service/TaskBuilder.java
+++ b/sal-service/src/main/java/org/ow2/proactive/sal/service/service/TaskBuilder.java
@@ -40,14 +40,14 @@
 import org.ow2.proactive.sal.service.util.Utils;
 import org.ow2.proactive.scheduler.common.task.ScriptTask;
 import org.ow2.proactive.scheduler.common.task.TaskVariable;
-import org.ow2.proactive.scripting.InvalidScriptException;
-import org.ow2.proactive.scripting.SelectionScript;
+import org.ow2.proactive.scripting.*;
 import org.springframework.stereotype.Service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Strings;
 
 import lombok.extern.log4j.Log4j2;
+import net.bytebuddy.dynamic.scaffold.TypeInitializer;
 
 
 @Log4j2
@@ -98,6 +98,8 @@ public class TaskBuilder {
 
     private static final String WAIT_FOR_LOCK_SCRIPT = "wait_for_lock_script.sh";
 
+    private static final String DRIAN_NODE_SCRIPT = "drain_node_script.sh";
+
     private static final String WAIT_FOR_MASTER_SCRIPT = "wait_for_master.groovy";
 
     private static final String SET_TOKEN_SCRIPT = "set_token.groovy";
@@ -892,10 +894,19 @@ private ScriptTask createSetTokenTask(String masterNodeToken) {
     }
 
     public ScriptTask createDeleteNodeTask(String nodeUrl) {
-        ScriptTask setTokenTask = PAFactory.createGroovyScriptTaskFromFile("Delete-Node", DELETE_NODE_SCRIPT);
+        ScriptTask deleteNodeTask = PAFactory.createGroovyScriptTaskFromFile("Delete-Node", DELETE_NODE_SCRIPT);
         Map<String, TaskVariable> variablesMap = new HashMap<>();
         variablesMap.put("nodeURL", new TaskVariable("nodeURL", nodeUrl));
-        setTokenTask.setVariables(variablesMap);
-        return setTokenTask;
+        deleteNodeTask.setVariables(variablesMap);
+        return deleteNodeTask;
+    }
+
+    public ScriptTask createDrainNodeTask(String nodeName, String masterNodeToken) {
+        ScriptTask drainNodeTask = PAFactory.createBashScriptTaskFromFile("Drain-Node", DRIAN_NODE_SCRIPT);
+        Map<String, TaskVariable> variablesMap = new HashMap<>();
+        variablesMap.put("nodeName", new TaskVariable("nodeName", nodeName));
+        drainNodeTask.setVariables(variablesMap);
+        drainNodeTask.addGenericInformation("NODE_ACCESS_TOKEN", masterNodeToken);
+        return drainNodeTask;
     }
 }
diff --git a/sal-service/src/main/resources/Define_NS_AWS.xml b/sal-service/src/main/resources/Define_NS_AWS.xml
index 02dfbd1..8f927a4 100644
--- a/sal-service/src/main/resources/Define_NS_AWS.xml
+++ b/sal-service/src/main/resources/Define_NS_AWS.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <job
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns="urn:proactive:jobdescriptor:3.13" xsi:schemaLocation="urn:proactive:jobdescriptor:3.13 http://www.activeeon.com/public_content/schemas/proactive/jobdescriptor/3.13/schedulerjob.xsd"  name="Define_NS_AWS" projectName="Morphemic"  priority="normal" onTaskError="continueJobExecution"  maxNumberOfExecution="2"  >
+        xmlns="urn:proactive:jobdescriptor:3.13" xsi:schemaLocation="urn:proactive:jobdescriptor:3.13 http://www.activeeon.com/public_content/schemas/proactive/jobdescriptor/3.13/schedulerjob.xsd"  name="Define_NS_AWS" projectName="NebulOuS"  priority="normal" onTaskError="continueJobExecution"  maxNumberOfExecution="2"  >
   <variables>
     <variable name="NS_name" value=""     />
     <variable name="NS_nVMs" value="0" model="PA:Integer"    />
diff --git a/sal-service/src/main/resources/Define_NS_AWS_AutoScale.xml b/sal-service/src/main/resources/Define_NS_AWS_AutoScale.xml
index f16bc78..6c8cdf4 100644
--- a/sal-service/src/main/resources/Define_NS_AWS_AutoScale.xml
+++ b/sal-service/src/main/resources/Define_NS_AWS_AutoScale.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <job
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="urn:proactive:jobdescriptor:3.13" xsi:schemaLocation="urn:proactive:jobdescriptor:3.13 http://www.activeeon.com/public_content/schemas/proactive/jobdescriptor/3.13/schedulerjob.xsd"  name="Define_NS_AWS_AS" projectName="Morphemic" priority="normal" onTaskError="continueJobExecution"  maxNumberOfExecution="2"  >
+  xmlns="urn:proactive:jobdescriptor:3.13" xsi:schemaLocation="urn:proactive:jobdescriptor:3.13 http://www.activeeon.com/public_content/schemas/proactive/jobdescriptor/3.13/schedulerjob.xsd"  name="Define_NS_AWS_AS" projectName="NebulOuS" priority="normal" onTaskError="continueJobExecution"  maxNumberOfExecution="2"  >
   <variables>
     <variable name="NS_name" value="" />
     <variable name="aws_username" value="" model="PA:HIDDEN"/>
diff --git a/sal-service/src/main/resources/Define_NS_OS.xml b/sal-service/src/main/resources/Define_NS_OS.xml
index de15efd..01c6687 100644
--- a/sal-service/src/main/resources/Define_NS_OS.xml
+++ b/sal-service/src/main/resources/Define_NS_OS.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <job
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="urn:proactive:jobdescriptor:3.13" xsi:schemaLocation="urn:proactive:jobdescriptor:3.13 http://www.activeeon.com/public_content/schemas/proactive/jobdescriptor/3.13/schedulerjob.xsd"  name="Define_NS_OS" projectName="Morphemic" priority="normal" onTaskError="continueJobExecution"  maxNumberOfExecution="2"  >
+  xmlns="urn:proactive:jobdescriptor:3.13" xsi:schemaLocation="urn:proactive:jobdescriptor:3.13 http://www.activeeon.com/public_content/schemas/proactive/jobdescriptor/3.13/schedulerjob.xsd"  name="Define_NS_OS" projectName="NebulOuS" priority="normal" onTaskError="continueJobExecution"  maxNumberOfExecution="2"  >
   <variables>
     <variable name="NS_name" value="" />
     <variable name="NS_nVMs" value="0" model="PA:Integer"/>
diff --git a/sal-service/src/main/resources/drain_node_script.sh b/sal-service/src/main/resources/drain_node_script.sh
new file mode 100644
index 0000000..82ec6ff
--- /dev/null
+++ b/sal-service/src/main/resources/drain_node_script.sh
@@ -0,0 +1,2 @@
+sudo -H -u ubuntu bash -c "kubectl drain $variables_nodeName --ignore-daemonsets"
+sudo -H -u ubuntu bash -c "kubectl delete node $variables_nodeName"