diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 0bcbb4702888b254523f2719adc6458985edf994..ea23bbe570c774612259833f74b5d0f0182abae4 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -58,7 +58,7 @@ services:
       #- DJANGO_PUBLIC_HTTP_HOST=http://localhost:8080
     ports:
       - "8080:8080"
-      - "7000-7005:7000-7005"
+      - "7000-7020:7000-7020"
     volumes:
       - ./data_rosetta/webapp/data:/data
       - ./data_rosetta/webapp/log:/var/log/webapp
diff --git a/services/webapp/code/rosetta/core_app/utils.py b/services/webapp/code/rosetta/core_app/utils.py
index 63e565aff1063277f3223df78bebdb9081865b37..0e3e0d9bacbad410ba1081300c76bb7adf683872 100644
--- a/services/webapp/code/rosetta/core_app/utils.py
+++ b/services/webapp/code/rosetta/core_app/utils.py
@@ -507,7 +507,7 @@ def setup_tunnel(task):
             if other_task.tunnel_port and not other_task.status in [TaskStatuses.exited, TaskStatuses.stopped]:
                 allocated_tunnel_ports.append(other_task.tunnel_port)
 
-        for port in range(7000, 7006):
+        for port in range(7000, 7021):
             if not port in allocated_tunnel_ports:
                 tunnel_port = port
                 break