diff --git a/autosubmit/job/job.py b/autosubmit/job/job.py
index dd60875a0954dbb5bf2228d1f22909d191ca9d0d..c68e989dadd88c600fe72cc42f8e4dbb7d398c40 100644
--- a/autosubmit/job/job.py
+++ b/autosubmit/job/job.py
@@ -129,6 +129,10 @@ class Job(object):
         """
         self._parents = parents
 
+    @property
+    def is_serial(self):
+        return str(self.processors) == '1'
+
     @property
     def platform(self):
         """
@@ -137,7 +141,7 @@ class Job(object):
         :return HPCPlatform object for the job to use
         :rtype: HPCPlatform
         """
-        if str(self.processors) == '1':
+        if self.is_serial:
             return self._platform.serial_platform
         else:
             return self._platform
@@ -162,7 +166,7 @@ class Job(object):
         """
         if self._queue is not None:
             return self._queue
-        if str(self.processors) == '1':
+        if self.is_serial:
             return self._platform.serial_platform.serial_queue
         else:
             return self._platform.queue
diff --git a/autosubmit/platforms/headers/ec_cca_header.py b/autosubmit/platforms/headers/ec_cca_header.py
index 4b51556e92096829db0a5a0a3b9cdff26a8764a2..b0b85b7bf0935c91402336902b51c2ef852f8e6d 100644
--- a/autosubmit/platforms/headers/ec_cca_header.py
+++ b/autosubmit/platforms/headers/ec_cca_header.py
@@ -34,7 +34,14 @@ class EcCcaHeader(object):
         :rtype: str
         """
         # There is no queue, so directive is empty
-        return ""
+        queue = job.parameters['CURRENT_QUEUE']
+        if not queue:
+            if job.is_serial:
+                queue = 'ns'
+            else:
+                queue = 'np'
+
+        return "PBS -q {0}".format(job.parameters['CURRENT_QUEUE'])
 
     # noinspection PyMethodMayBeStatic
     def get_tasks_per_node(self, job):
@@ -95,15 +102,16 @@ class EcCcaHeader(object):
             return '\n'.join(str(s) for s in job.parameters['CUSTOM_DIRECTIVES'])
         return ""
 
+
     SERIAL = textwrap.dedent("""\
              ###############################################################################
              #                   %TASKTYPE% %EXPID% EXPERIMENT
              ###############################################################################
              #
+             #%QUEUE_DIRECTIVE%
              #PBS -N %JOBNAME%
              #PBS -o %CURRENT_SCRATCH_DIR%/%CURRENT_PROJ%/%CURRENT_USER%/%EXPID%/LOG_%EXPID%/%OUT_LOG_DIRECTIVE%
              #PBS -e %CURRENT_SCRATCH_DIR%/%CURRENT_PROJ%/%CURRENT_USER%/%EXPID%/LOG_%EXPID%/%ERR_LOG_DIRECTIVE%
-             #PBS -q ns
              #PBS -l walltime=%WALLCLOCK%:00
              #PBS -l EC_billing_account=%CURRENT_BUDG%
              %CUSTOM_DIRECTIVES%
@@ -117,10 +125,10 @@ class EcCcaHeader(object):
              #                   %TASKTYPE% %EXPID% EXPERIMENT
              ###############################################################################
              #
+             #%QUEUE_DIRECTIVE%
              #PBS -N %JOBNAME%
              #PBS -o %CURRENT_SCRATCH_DIR%/%CURRENT_PROJ%/%CURRENT_USER%/%EXPID%/LOG_%EXPID%/%OUT_LOG_DIRECTIVE%
              #PBS -e %CURRENT_SCRATCH_DIR%/%CURRENT_PROJ%/%CURRENT_USER%/%EXPID%/LOG_%EXPID%/%ERR_LOG_DIRECTIVE%
-             #PBS -q np
              #PBS -l EC_total_tasks=%NUMPROC%
              %THREADS_PER_TASK_DIRECTIVE%
              %TASKS_PER_NODE_DIRECTIVE%