diff --git a/VERSION b/VERSION
index 2536c7c28fac3720d93ff42ae9c83c50f6f2a603..b3db1e6204a321479cf888d298bed531f2315a3d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.104
+4.0.105
diff --git a/autosubmit/autosubmit.py b/autosubmit/autosubmit.py
index 0d76c7d187679697c1ed128c268b286f4a105708..89f4d7bbf74b4527de656f977459580d23647707 100644
--- a/autosubmit/autosubmit.py
+++ b/autosubmit/autosubmit.py
@@ -4052,7 +4052,7 @@ class Autosubmit:
                 shutil.copyfile(template_path, backup_path)
             template_content = open(template_path, 'r', encoding=locale.getlocale()[1]).read()
             # Look for %_%
-            variables = re.findall('%(?<!%%)[a-zA-Z0-9_.]+%(?!%%)', template_content,flags=re.IGNORECASE)
+            variables = re.findall('%(?<!%%)[a-zA-Z0-9_.-]+%(?!%%)', template_content,flags=re.IGNORECASE)
             variables = [variable[1:-1].upper() for variable in variables]
             results = {}
             # Change format
@@ -4078,7 +4078,7 @@ class Autosubmit:
             # write_it
             # Deletes unused keys from confs
             if template_path.name.lower().find("autosubmit") > -1:
-                template_content = re.sub('(?m)^( )*(EXPID:)( )*[a-zA-Z0-9]*(\n)*', "", template_content, flags=re.I)
+                template_content = re.sub('(?m)^( )*(EXPID:)( )*[a-zA-Z0-9._-]*(\n)*', "", template_content, flags=re.I)
             # Write final result
             open(template_path, "w").write(template_content)
 
diff --git a/autosubmit/job/job.py b/autosubmit/job/job.py
index c16924e1f5c0ac8a2e971e0b60dcb1f6fd5803a3..95a4e44b10b71c1e7668bc95b254a9a599cb178b 100644
--- a/autosubmit/job/job.py
+++ b/autosubmit/job/job.py
@@ -1948,7 +1948,7 @@ class Job(object):
         #TODO regresion test
         for additional_file, additional_template_content in zip(self.additional_files, additional_templates):
             # append to a list all names don't matter the location, inside additional_template_content that  starts with % and ends with %
-            placeholders_inside_additional_template = re.findall('%(?<!%%)[a-zA-Z0-9_.]+%(?!%%)', additional_template_content,flags=re.IGNORECASE)
+            placeholders_inside_additional_template = re.findall('%(?<!%%)[a-zA-Z0-9_.-]+%(?!%%)', additional_template_content,flags=re.IGNORECASE)
             for placeholder in placeholders_inside_additional_template:
                 placeholder = placeholder[1:-1]
                 value = str(parameters.get(placeholder.upper(),""))
@@ -2023,11 +2023,11 @@ class Job(object):
         parameters = self.update_parameters(as_conf, parameters)
         template_content,additional_templates = self.update_content(as_conf)
         if template_content is not False:
-            variables = re.findall('%(?<!%%)[a-zA-Z0-9_.]+%(?!%%)', template_content,flags=re.IGNORECASE)
+            variables = re.findall('%(?<!%%)[a-zA-Z0-9_.-]+%(?!%%)', template_content,flags=re.IGNORECASE)
             variables = [variable[1:-1] for variable in variables]
             variables = [variable for variable in variables if variable not in self.default_parameters]
             for template in additional_templates:
-                variables_tmp = re.findall('%(?<!%%)[a-zA-Z0-9_.]+%(?!%%)', template,flags=re.IGNORECASE)
+                variables_tmp = re.findall('%(?<!%%)[a-zA-Z0-9_.-]+%(?!%%)', template,flags=re.IGNORECASE)
                 variables_tmp = [variable[1:-1] for variable in variables_tmp]
                 variables_tmp = [variable for variable in variables_tmp if variable not in self.default_parameters]
                 variables.extend(variables_tmp)
diff --git a/autosubmit/job/job_dict.py b/autosubmit/job/job_dict.py
index ef2800988ed5ccafe5baff8df54ab046db6f692a..ca98e92a07d578af9fa68de85dd7cdbb5b3ccaa4 100644
--- a/autosubmit/job/job_dict.py
+++ b/autosubmit/job/job_dict.py
@@ -391,8 +391,8 @@ class DicJobs:
         job.queue = str(parameters[section].get( "QUEUE", ""))
 
         job.ec_queue = str(parameters[section].get("EC_QUEUE", ""))
-        if job.ec_queue == "" and job.platform_name != "LOCAL":
-            job.ec_queue = str(self.experiment_data["PLATFORMS"][job.platform_name].get("EC_QUEUE","hpc"))
+        if job.ec_queue == "":
+            job.ec_queue = str(self.experiment_data["PLATFORMS"].get(job.platform_name,{}).get("EC_QUEUE","hpc"))
 
         job.partition = str(parameters[section].get( "PARTITION", ""))
         job.check = str(parameters[section].get( "CHECK", "true")).lower()
diff --git a/autosubmit/job/job_list.py b/autosubmit/job/job_list.py
index d7648a2e96a520fde2d7e89fc310afa3284f2a97..07150d9640a292a3652c22d450b4e3492b93766b 100644
--- a/autosubmit/job/job_list.py
+++ b/autosubmit/job/job_list.py
@@ -763,7 +763,7 @@ class JobList(object):
                     if element == "":
                         continue
                     # Get only the first alphanumeric part and [:] chars
-                    parsed_element = re.findall(r"([\[:\]a-zA-Z0-9]+)", element)[0].lower()
+                    parsed_element = re.findall(r"([\[:\]a-zA-Z0-9._-]+)", element)[0].lower()
                     extra_data = element[len(parsed_element):]
                     parsed_element = JobList._parse_filter_to_check(parsed_element, value_list = value_list, level_to_check = filter_type)
                     # convert list to str
diff --git a/autosubmit/platforms/ecplatform.py b/autosubmit/platforms/ecplatform.py
index 3c4110f006fa3ff842e0146593e496db6e98de87..12fb7443efcb34b736fd23d96e3f545091ce90e8 100644
--- a/autosubmit/platforms/ecplatform.py
+++ b/autosubmit/platforms/ecplatform.py
@@ -95,8 +95,6 @@ class EcPlatform(ParamikoPlatform):
         self._checkjob_cmd = "ecaccess-job-list "
         self._checkhost_cmd = "ecaccess-certificate-list"
         self._checkvalidcert_cmd = "ecaccess-gateway-connected"
-        self._submit_cmd = ("ecaccess-job-submit -distant -queueName " + self.ec_queue + " " + self.host + ":" +
-                            self.remote_log_dir + "/")
         self._submit_command_name = "ecaccess-job-submit"
         self.put_cmd = "ecaccess-file-put"
         self.get_cmd = "ecaccess-file-get"
@@ -115,7 +113,8 @@ class EcPlatform(ParamikoPlatform):
 
     def get_mkdir_cmd(self):
         return self.mkdir_cmd
-    def set_submit_cmd(self,ec_queue="hpc"):
+
+    def set_submit_cmd(self,ec_queue):
         self._submit_cmd = ("ecaccess-job-submit -distant -queueName " + ec_queue + " " + self.host + ":" +
                             self.remote_log_dir + "/")
 
@@ -228,14 +227,21 @@ class EcPlatform(ParamikoPlatform):
             lang = locale.getdefaultlocale()[1]
             if lang is None:
                 lang = 'UTF-8'
-        try:
-            output = subprocess.check_output(command, shell=True).decode(lang)
-        except subprocess.CalledProcessError as e:
-            if command.find("ecaccess-job-submit") != -1:
-                raise AutosubmitError("bad parameters. Error submitting job.")
-            if not ignore_log:
-                raise AutosubmitError('Could not execute command {0} on {1}'.format(e.cmd, self.host),7500,str(e))
-            return False
+        retries = 3
+        success = False
+        err_message = ""
+        output = ""
+        while not success and retries > 0:
+            try:
+                output = subprocess.check_output(command, shell=True).decode(lang)
+                success = True
+            except Exception as e:
+                err_message = str(e)
+                success = False
+                retries = retries - 1
+                sleep(1)
+        if not success:
+            raise AutosubmitError(f'Could not execute command {command} on {self.host}',7500, str(err_message))
         self._ssh_output = output
         return True
 
diff --git a/autosubmit/platforms/paramiko_platform.py b/autosubmit/platforms/paramiko_platform.py
index 58582bc0b9e71963111afe547c5ef8ced1975ea9..a759f6d5472c9f79f1e77545f7130ae4d14de0dc 100644
--- a/autosubmit/platforms/paramiko_platform.py
+++ b/autosubmit/platforms/paramiko_platform.py
@@ -513,6 +513,7 @@ class ParamikoPlatform(Platform):
             x11 = job.x11
 
         cmd = self.get_submit_cmd(script_name, job, hold=hold, export=export)
+        Log.debug(f"Submitting job with the command: {cmd}")
         if cmd is None:
             return None
         if self.send_command(cmd,x11=x11):
diff --git a/requeriments.txt b/requeriments.txt
index 11bef0c11f2bd6ade5d85a7442c6a12905ed3d46..47fd8ccfb185ff8ca9792bfbdd8e67931e44b76e 100644
--- a/requeriments.txt
+++ b/requeriments.txt
@@ -1,7 +1,7 @@
 zipp>=3.1.0
 setuptools>=60.8.2
 cython
-autosubmitconfigparser==1.0.50
+autosubmitconfigparser==1.0.53
 paramiko>=2.9.2
 bcrypt>=3.2
 PyNaCl>=1.5.0