diff --git a/api/tests/requirements.txt b/api/tests/requirements.txt
index 5491296abb1..0bfa736a91b 100644
--- a/api/tests/requirements.txt
+++ b/api/tests/requirements.txt
@@ -30,7 +30,7 @@ pytest-aiohttp==0.3.0     # via -r requirements.in
 pytest-cov==2.9.0         # via -r requirements.in
 pytest-instafail==0.4.1.post0  # via -r requirements.in
 pytest-sugar==0.9.3       # via -r requirements.in
-pytest==5.4.2             # via -r requirements.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-sugar
+pytest==5.4.3             # via -r requirements.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-sugar
 pyyaml==5.3.1             # via openapi-spec-validator
 six==1.15.0               # via isodate, jsonschema, openapi-core, openapi-schema-validator, openapi-spec-validator, packaging
 strict-rfc3339==0.7       # via openapi-schema-validator
diff --git a/packages/postgres-database/requirements/_migration.txt b/packages/postgres-database/requirements/_migration.txt
index f41e54c7510..999ad388cb4 100644
--- a/packages/postgres-database/requirements/_migration.txt
+++ b/packages/postgres-database/requirements/_migration.txt
@@ -8,7 +8,7 @@ alembic==1.4.2            # via -r requirements/_migration.in
 certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via requests
 click==7.1.2              # via -r requirements/_migration.in
-docker==4.2.0             # via -r requirements/_migration.in
+docker==4.2.1             # via -r requirements/_migration.in
 idna==2.9                 # via -r requirements/_base.txt, requests, yarl
 mako==1.1.2               # via alembic
 markupsafe==1.1.1         # via mako
diff --git a/packages/postgres-database/requirements/_test.txt b/packages/postgres-database/requirements/_test.txt
index 351e7976abb..b84a9ea42c2 100644
--- a/packages/postgres-database/requirements/_test.txt
+++ b/packages/postgres-database/requirements/_test.txt
@@ -15,7 +15,7 @@ chardet==3.0.4            # via -r requirements/_migration.txt, aiohttp, request
 click==7.1.2              # via -r requirements/_migration.txt
 coverage==5.1             # via -r requirements/_test.in, coveralls, pytest-cov
 coveralls==2.0.0          # via -r requirements/_test.in
-docker==4.2.0             # via -r requirements/_migration.txt
+docker==4.2.1             # via -r requirements/_migration.txt
 docopt==0.6.2             # via coveralls
 faker==4.1.0              # via -r requirements/_test.in
 idna-ssl==1.1.0           # via aiohttp
@@ -39,7 +39,7 @@ pytest-cov==2.9.0         # via -r requirements/_test.in
 pytest-docker==0.7.2      # via -r requirements/_test.in
 pytest-instafail==0.4.1.post0  # via -r requirements/_test.in
 pytest-runner==5.2        # via -r requirements/_test.in
-pytest==5.4.2             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail
+pytest==5.4.3             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail
 python-dateutil==2.8.1    # via -r requirements/_migration.txt, alembic, faker
 python-editor==1.0.4      # via -r requirements/_migration.txt, alembic
 pyyaml==5.3.1             # via -r requirements/_test.in
diff --git a/packages/s3wrapper/requirements/_test.txt b/packages/s3wrapper/requirements/_test.txt
index 20b8a33b19d..e6d34318a92 100644
--- a/packages/s3wrapper/requirements/_test.txt
+++ b/packages/s3wrapper/requirements/_test.txt
@@ -27,7 +27,7 @@ pyparsing==2.4.7          # via packaging
 pytest-cov==2.9.0         # via -r requirements/_test.in
 pytest-docker==0.7.2      # via -r requirements/_test.in
 pytest-runner==5.2        # via -r requirements/_test.in
-pytest==5.4.2             # via -r requirements/_test.in, pytest-cov
+pytest==5.4.3             # via -r requirements/_test.in, pytest-cov
 python-dateutil==2.8.1    # via -r requirements/_base.txt, minio
 pytz==2020.1              # via -r requirements/_base.txt, minio
 requests==2.23.0          # via -r requirements/_test.in, coveralls
diff --git a/packages/service-library/requirements/_base.txt b/packages/service-library/requirements/_base.txt
index 4ff283a4f3d..36a65894d15 100644
--- a/packages/service-library/requirements/_base.txt
+++ b/packages/service-library/requirements/_base.txt
@@ -11,9 +11,7 @@ aiozipkin==0.6.0          # via -r requirements/_base.in
 async-timeout==3.0.1      # via aiohttp
 attrs==19.3.0             # via -r requirements/_base.in, aiohttp, jsonschema, openapi-core
 chardet==3.0.4            # via aiohttp
-idna-ssl==1.1.0           # via aiohttp
-idna==2.9                 # via idna-ssl, yarl
-importlib-metadata==1.6.0  # via jsonschema
+idna==2.9                 # via yarl
 isodate==0.6.0            # via openapi-core
 jsonschema==3.2.0         # via -r requirements/_base.in, openapi-spec-validator
 lazy-object-proxy==1.4.3  # via openapi-core
@@ -29,11 +27,9 @@ sqlalchemy[postgresql_psycopg2binary]==1.3.17  # via -r requirements/_base.in, a
 strict-rfc3339==0.7       # via openapi-core
 tenacity==6.2.0           # via -r requirements/_base.in
 trafaret==2.0.2           # via -r requirements/_base.in
-typing-extensions==3.7.4.2  # via aiohttp
-ujson==2.0.3              # via -r requirements/_base.in
+ujson==3.0.0              # via -r requirements/_base.in
 werkzeug==1.0.1           # via -r requirements/_base.in
 yarl==1.4.2               # via aiohttp
-zipp==3.1.0               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/packages/service-library/requirements/_test.txt b/packages/service-library/requirements/_test.txt
index 810e0010efe..2a4e82d35b0 100644
--- a/packages/service-library/requirements/_test.txt
+++ b/packages/service-library/requirements/_test.txt
@@ -16,9 +16,9 @@ chardet==3.0.4            # via -r requirements/_base.txt, aiohttp, requests
 coverage==5.1             # via -r requirements/_test.in, coveralls, pytest-cov
 coveralls==2.0.0          # via -r requirements/_test.in
 docopt==0.6.2             # via coveralls
-idna-ssl==1.1.0           # via -r requirements/_base.txt, aiohttp
+idna-ssl==1.1.0           # via -r requirements/_base.txt
 idna==2.9                 # via -r requirements/_base.txt, idna-ssl, requests, yarl
-importlib-metadata==1.6.0  # via -r requirements/_base.txt, jsonschema, pluggy, pytest
+importlib-metadata==1.6.0  # via -r requirements/_base.txt
 isodate==0.6.0            # via -r requirements/_base.txt, openapi-core
 isort==4.3.21             # via pylint
 jsonschema==3.2.0         # via -r requirements/_base.txt, openapi-spec-validator
@@ -40,10 +40,10 @@ pytest-aiohttp==0.3.0     # via -r requirements/_test.in
 pytest-cov==2.9.0         # via -r requirements/_test.in
 pytest-docker==0.7.2      # via -r requirements/_test.in
 pytest-instafail==0.4.1.post0  # via -r requirements/_test.in
-pytest-mock==3.1.0        # via -r requirements/_test.in
+pytest-mock==3.1.1        # via -r requirements/_test.in
 pytest-runner==5.2        # via -r requirements/_test.in
 pytest-sugar==0.9.3       # via -r requirements/_test.in
-pytest==5.4.2             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
+pytest==5.4.3             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
 pyyaml==5.3.1             # via -r requirements/_base.txt, openapi-spec-validator
 requests==2.23.0          # via coveralls
 six==1.15.0               # via -r requirements/_base.txt, astroid, isodate, jsonschema, openapi-core, openapi-spec-validator, packaging, pyrsistent, tenacity
@@ -53,15 +53,12 @@ tenacity==6.2.0           # via -r requirements/_base.txt
 termcolor==1.1.0          # via pytest-sugar
 toml==0.10.1              # via pylint
 trafaret==2.0.2           # via -r requirements/_base.txt
-typed-ast==1.4.1          # via astroid
-typing-extensions==3.7.4.2  # via -r requirements/_base.txt, aiohttp
-ujson==2.0.3              # via -r requirements/_base.txt
+ujson==3.0.0              # via -r requirements/_base.txt
 urllib3==1.25.9           # via requests
 wcwidth==0.1.9            # via pytest
 werkzeug==1.0.1           # via -r requirements/_base.txt
 wrapt==1.12.1             # via astroid
 yarl==1.4.2               # via -r requirements/_base.txt, aiohttp
-zipp==3.1.0               # via -r requirements/_base.txt, importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/packages/simcore-sdk/requirements/_test.txt b/packages/simcore-sdk/requirements/_test.txt
index 476f5dc7e50..c54809e303d 100644
--- a/packages/simcore-sdk/requirements/_test.txt
+++ b/packages/simcore-sdk/requirements/_test.txt
@@ -16,7 +16,7 @@ coverage==5.1             # via -r requirements/_test.in, coveralls, pytest-cov
 coveralls==2.0.0          # via -r requirements/_test.in
 dataclasses==0.7          # via -r requirements/_base.txt, pydantic
 decorator==4.4.2          # via -r requirements/_base.txt, networkx
-docker==4.2.0             # via -r requirements/_test.in
+docker==4.2.1             # via -r requirements/_test.in
 docopt==0.6.2             # via coveralls
 idna-ssl==1.1.0           # via -r requirements/_base.txt, aiohttp
 idna==2.9                 # via -r requirements/_base.txt, idna-ssl, requests, yarl
@@ -42,7 +42,7 @@ pytest-instafail==0.4.1.post0  # via -r requirements/_test.in
 pytest-mock==3.1.0        # via -r requirements/_test.in
 pytest-runner==5.2        # via -r requirements/_test.in
 pytest-sugar==0.9.3       # via -r requirements/_test.in
-pytest==5.4.2             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
+pytest==5.4.3             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
 pyyaml==5.3.1             # via -r requirements/_base.txt, trafaret-config
 requests==2.23.0          # via -r requirements/_test.in, coveralls, docker
 six==1.15.0               # via -r requirements/_base.txt, astroid, docker, packaging, tenacity, websocket-client
diff --git a/scripts/requirements.Makefile b/scripts/requirements.Makefile
index 7dee646923b..022d5947e33 100644
--- a/scripts/requirements.Makefile
+++ b/scripts/requirements.Makefile
@@ -3,7 +3,7 @@
 # SEE docs/python-dependencies.md
 #
 
-.PHONY: reqs check clean help
+.PHONY: touch reqs check clean help
 .DEFAULT_GOAL := help
 
 UPGRADE_OPTION := $(if $(upgrade),--upgrade-package $(upgrade),--upgrade)
@@ -14,6 +14,9 @@ outputs := $(objects:.in=.txt)
 
 reqs: $(outputs) ## pip-compiles all requirements/*.in -> requirements/*.txt; make reqs upgrade=foo will only upgrade package foo
 
+touch:
+	@$(foreach p,${objects},touch ${p};)
+
 # NOTE: runs above requirememts/ such that comments sync with dependabot's
 %.txt: %.in
 	cd ..; \
diff --git a/scripts/requirements/Makefile b/scripts/requirements/Makefile
index 6c6b3916856..db713156f2d 100644
--- a/scripts/requirements/Makefile
+++ b/scripts/requirements/Makefile
@@ -9,7 +9,8 @@
 #   make packages upgrade=name-of-package
 #
 #
-# WARNING: USE CAREFULLY. STILL UNDER DEVELOPMENT
+# WARNING: this batch MUST ONLY be used for non-services. Services are INDEPENDENT
+#          and to upgrade them, use services/{servicesname}/requirements/Makefile
 #
 .DEFAULT_GOAL := help
 
diff --git a/services/api-gateway/requirements/_base.txt b/services/api-gateway/requirements/_base.txt
index 02700496f28..db53cf71332 100644
--- a/services/api-gateway/requirements/_base.txt
+++ b/services/api-gateway/requirements/_base.txt
@@ -2,13 +2,13 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --build-isolation --output-file=_base.txt _base.in
+#    pip-compile --output-file=requirements/_base.txt requirements/_base.in
 #
 aiofiles==0.4.0           # via fastapi
-aiopg[sa]==1.0.0          # via -r _base.in
+aiopg[sa]==1.0.0          # via -r requirements/_base.in
 aniso8601==7.0.0          # via graphene
-async-exit-stack==1.0.1   # via -r _base.in, fastapi
-async-generator==1.10     # via -r _base.in, fastapi
+async-exit-stack==1.0.1   # via -r requirements/_base.in, fastapi
+async-generator==1.10     # via -r requirements/_base.in, fastapi
 bcrypt==3.1.7             # via passlib
 certifi==2019.11.28       # via requests
 cffi==1.14.0              # via bcrypt
@@ -17,7 +17,7 @@ click==7.1.1              # via uvicorn
 dataclasses==0.7          # via pydantic
 dnspython==1.16.0         # via email-validator
 email-validator==1.0.5    # via fastapi
-fastapi[all]==0.52.0      # via -r _base.in
+fastapi[all]==0.52.0      # via -r requirements/_base.in
 graphene==2.1.8           # via fastapi
 graphql-core==2.3.1       # via graphene, graphql-relay
 graphql-relay==2.0.1      # via graphene
@@ -27,12 +27,12 @@ idna==2.9                 # via email-validator, requests
 itsdangerous==1.1.0       # via fastapi
 jinja2==2.11.1            # via fastapi
 markupsafe==1.1.1         # via jinja2
-passlib[bcrypt]==1.7.2    # via -r _base.in
+passlib[bcrypt]==1.7.2    # via -r requirements/_base.in
 promise==2.3              # via graphql-core, graphql-relay
 psycopg2-binary==2.8.4    # via aiopg, sqlalchemy
 pycparser==2.20           # via cffi
 pydantic==1.4             # via fastapi
-pyjwt==1.7.1              # via -r _base.in
+pyjwt==1.7.1              # via -r requirements/_base.in
 python-multipart==0.0.5   # via fastapi
 pyyaml==5.3               # via fastapi
 requests==2.23.0          # via fastapi
@@ -40,7 +40,7 @@ rx==1.6.1                 # via graphql-core
 six==1.14.0               # via bcrypt, graphene, graphql-core, graphql-relay, python-multipart, tenacity
 sqlalchemy[postgresql_psycopg2binary]==1.3.15  # via aiopg
 starlette==0.13.2         # via fastapi
-tenacity==6.1.0           # via -r _base.in
+tenacity==6.1.0           # via -r requirements/_base.in
 ujson==2.0.2              # via fastapi
 urllib3==1.25.8           # via requests
 uvicorn==0.11.3           # via fastapi
diff --git a/services/api-gateway/requirements/_test.txt b/services/api-gateway/requirements/_test.txt
index d24622d4a7b..215cfd4d0b6 100644
--- a/services/api-gateway/requirements/_test.txt
+++ b/services/api-gateway/requirements/_test.txt
@@ -2,83 +2,83 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --build-isolation --output-file=_test.txt _test.in
+#    pip-compile --output-file=requirements/_test.txt requirements/_test.in
 #
-aiofiles==0.4.0           # via -r _base.txt, fastapi
+aiofiles==0.4.0           # via -r requirements/_base.txt, fastapi
 aiohttp==3.6.2            # via pytest-aiohttp
-aiopg[sa]==1.0.0          # via -r _base.txt
-aniso8601==7.0.0          # via -r _base.txt, graphene
+aiopg[sa]==1.0.0          # via -r requirements/_base.txt
+aniso8601==7.0.0          # via -r requirements/_base.txt, graphene
 astroid==2.3.3            # via pylint
-async-exit-stack==1.0.1   # via -r _base.txt, fastapi
-async-generator==1.10     # via -r _base.txt, fastapi
+async-exit-stack==1.0.1   # via -r requirements/_base.txt, fastapi
+async-generator==1.10     # via -r requirements/_base.txt, fastapi
 async-timeout==3.0.1      # via aiohttp
 attrs==19.3.0             # via aiohttp, pytest, pytest-docker
-bcrypt==3.1.7             # via -r _base.txt, passlib
-certifi==2019.11.28       # via -r _base.txt, requests
-cffi==1.14.0              # via -r _base.txt, bcrypt
-change-case==0.5.2        # via -r _test.in
-chardet==3.0.4            # via -r _base.txt, aiohttp, requests
-click==7.1.1              # via -r _base.txt, uvicorn
-codecov==2.0.16           # via -r _test.in
+bcrypt==3.1.7             # via -r requirements/_base.txt, passlib
+certifi==2019.11.28       # via -r requirements/_base.txt, requests
+cffi==1.14.0              # via -r requirements/_base.txt, bcrypt
+change-case==0.5.2        # via -r requirements/_test.in
+chardet==3.0.4            # via -r requirements/_base.txt, aiohttp, requests
+click==7.1.1              # via -r requirements/_base.txt, uvicorn
+codecov==2.0.16           # via -r requirements/_test.in
 coverage==5.0.4           # via codecov, coveralls, pytest-cov
-coveralls==1.11.1         # via -r _test.in
-dataclasses==0.7          # via -r _base.txt, pydantic
-dnspython==1.16.0         # via -r _base.txt, email-validator
+coveralls==1.11.1         # via -r requirements/_test.in
+dataclasses==0.7          # via -r requirements/_base.txt, pydantic
+dnspython==1.16.0         # via -r requirements/_base.txt, email-validator
 docopt==0.6.2             # via coveralls
-email-validator==1.0.5    # via -r _base.txt, fastapi
-faker==4.0.2              # via -r _test.in
-fastapi[all]==0.52.0      # via -r _base.txt
-graphene==2.1.8           # via -r _base.txt, fastapi
-graphql-core==2.3.1       # via -r _base.txt, graphene, graphql-relay
-graphql-relay==2.0.1      # via -r _base.txt, graphene
-h11==0.9.0                # via -r _base.txt, uvicorn
-httptools==0.1.1          # via -r _base.txt, uvicorn
+email-validator==1.0.5    # via -r requirements/_base.txt, fastapi
+faker==4.0.2              # via -r requirements/_test.in
+fastapi[all]==0.52.0      # via -r requirements/_base.txt
+graphene==2.1.8           # via -r requirements/_base.txt, fastapi
+graphql-core==2.3.1       # via -r requirements/_base.txt, graphene, graphql-relay
+graphql-relay==2.0.1      # via -r requirements/_base.txt, graphene
+h11==0.9.0                # via -r requirements/_base.txt, uvicorn
+httptools==0.1.1          # via -r requirements/_base.txt, uvicorn
 idna-ssl==1.1.0           # via aiohttp
-idna==2.9                 # via -r _base.txt, email-validator, idna-ssl, requests, yarl
+idna==2.9                 # via -r requirements/_base.txt, email-validator, idna-ssl, requests, yarl
 importlib-metadata==1.5.0  # via pluggy, pytest
 isort==4.3.21             # via pylint
-itsdangerous==1.1.0       # via -r _base.txt, fastapi
-jinja2==2.11.1            # via -r _base.txt, -r _test.in, fastapi
+itsdangerous==1.1.0       # via -r requirements/_base.txt, fastapi
+jinja2==2.11.1            # via -r requirements/_base.txt, -r requirements/_test.in, fastapi
 lazy-object-proxy==1.4.3  # via astroid
-markupsafe==1.1.1         # via -r _base.txt, jinja2
+markupsafe==1.1.1         # via -r requirements/_base.txt, jinja2
 mccabe==0.6.1             # via pylint
 more-itertools==8.2.0     # via pytest
 multidict==4.7.5          # via aiohttp, yarl
 packaging==20.3           # via pytest
-passlib[bcrypt]==1.7.2    # via -r _base.txt
+passlib[bcrypt]==1.7.2    # via -r requirements/_base.txt
 pluggy==0.13.1            # via pytest
-promise==2.3              # via -r _base.txt, graphql-core, graphql-relay
-psycopg2-binary==2.8.4    # via -r _base.txt, aiopg, sqlalchemy
+promise==2.3              # via -r requirements/_base.txt, graphql-core, graphql-relay
+psycopg2-binary==2.8.4    # via -r requirements/_base.txt, aiopg, sqlalchemy
 py==1.8.1                 # via pytest
-pycparser==2.20           # via -r _base.txt, cffi
-pydantic==1.4             # via -r _base.txt, fastapi
-pyjwt==1.7.1              # via -r _base.txt
-pylint==2.4.4             # via -r _test.in
+pycparser==2.20           # via -r requirements/_base.txt, cffi
+pydantic==1.4             # via -r requirements/_base.txt, fastapi
+pyjwt==1.7.1              # via -r requirements/_base.txt
+pylint==2.4.4             # via -r requirements/_test.in
 pyparsing==2.4.6          # via packaging
-pytest-aiohttp==0.3.0     # via -r _test.in
-pytest-cov==2.8.1         # via -r _test.in
-pytest-docker==0.7.2      # via -r _test.in
-pytest-mock==2.0.0        # via -r _test.in
-pytest-runner==5.2        # via -r _test.in
-pytest==5.4.1             # via -r _test.in, pytest-aiohttp, pytest-cov, pytest-mock
+pytest-aiohttp==0.3.0     # via -r requirements/_test.in
+pytest-cov==2.8.1         # via -r requirements/_test.in
+pytest-docker==0.7.2      # via -r requirements/_test.in
+pytest-mock==2.0.0        # via -r requirements/_test.in
+pytest-runner==5.2        # via -r requirements/_test.in
+pytest==5.4.3             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-mock
 python-dateutil==2.8.1    # via faker
-python-multipart==0.0.5   # via -r _base.txt, fastapi
-pyyaml==5.3               # via -r _base.txt, fastapi
-requests==2.23.0          # via -r _base.txt, codecov, coveralls, fastapi
-rx==1.6.1                 # via -r _base.txt, graphql-core
-six==1.14.0               # via -r _base.txt, astroid, bcrypt, graphene, graphql-core, graphql-relay, packaging, promise, python-dateutil, python-multipart, tenacity
-sqlalchemy[postgresql_psycopg2binary]==1.3.15  # via -r _base.txt, aiopg
-starlette==0.13.2         # via -r _base.txt, fastapi
-tenacity==6.1.0           # via -r _base.txt
+python-multipart==0.0.5   # via -r requirements/_base.txt, fastapi
+pyyaml==5.3               # via -r requirements/_base.txt, fastapi
+requests==2.23.0          # via -r requirements/_base.txt, codecov, coveralls, fastapi
+rx==1.6.1                 # via -r requirements/_base.txt, graphql-core
+six==1.14.0               # via -r requirements/_base.txt, astroid, bcrypt, graphene, graphql-core, graphql-relay, packaging, promise, python-dateutil, python-multipart, tenacity
+sqlalchemy[postgresql_psycopg2binary]==1.3.15  # via -r requirements/_base.txt, aiopg
+starlette==0.13.2         # via -r requirements/_base.txt, fastapi
+tenacity==6.1.0           # via -r requirements/_base.txt
 text-unidecode==1.3       # via faker
 typed-ast==1.4.1          # via astroid
 typing-extensions==3.7.4.1  # via aiohttp
-ujson==2.0.2              # via -r _base.txt, fastapi
-urllib3==1.25.8           # via -r _base.txt, requests
-uvicorn==0.11.3           # via -r _base.txt, fastapi
-uvloop==0.14.0            # via -r _base.txt, uvicorn
+ujson==2.0.2              # via -r requirements/_base.txt, fastapi
+urllib3==1.25.8           # via -r requirements/_base.txt, requests
+uvicorn==0.11.3           # via -r requirements/_base.txt, fastapi
+uvloop==0.14.0            # via -r requirements/_base.txt, uvicorn
 wcwidth==0.1.8            # via pytest
-websockets==8.1           # via -r _base.txt, uvicorn
+websockets==8.1           # via -r requirements/_base.txt, uvicorn
 wrapt==1.11.2             # via astroid
 yarl==1.4.2               # via aiohttp
 zipp==3.1.0               # via importlib-metadata
diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt
index 0c68b47bfcf..c6a2bafafa0 100644
--- a/services/catalog/requirements/_base.txt
+++ b/services/catalog/requirements/_base.txt
@@ -2,20 +2,20 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=_base.txt _base.in
+#    pip-compile --output-file=requirements/_base.txt requirements/_base.in
 #
 aiofiles==0.4.0           # via fastapi
-aiopg[sa]==1.0.0
+aiopg[sa]==1.0.0          # via -r requirements/_base.in
 aniso8601==7.0.0          # via graphene
-async-exit-stack==1.0.1
-async-generator==1.10
+async-exit-stack==1.0.1   # via -r requirements/_base.in, fastapi
+async-generator==1.10     # via -r requirements/_base.in, fastapi
 certifi==2019.11.28       # via requests
 chardet==3.0.4            # via requests
 click==7.0                # via uvicorn
 dataclasses==0.7          # via pydantic
 dnspython==1.16.0         # via email-validator
 email-validator==1.0.5    # via fastapi
-fastapi[all]==0.48.0
+fastapi[all]==0.48.0      # via -r requirements/_base.in
 graphene==2.1.8           # via fastapi
 graphql-core==2.3.1       # via graphene, graphql-relay
 graphql-relay==2.0.1      # via graphene
@@ -30,16 +30,16 @@ promise==2.3              # via graphql-core, graphql-relay
 psycopg2-binary==2.8.4    # via aiopg, sqlalchemy
 pydantic==1.4             # via fastapi
 python-multipart==0.0.5   # via fastapi
-pyyaml==5.3
+pyyaml==5.3               # via -r requirements/_base.in, fastapi
 requests==2.22.0          # via fastapi
 rx==1.6.1                 # via graphql-core
-six==1.14.0               # via graphene, graphql-core, graphql-relay, promise, python-multipart, tenacity
-sqlalchemy[postgresql_psycopg2binary]==1.3.13
+six==1.14.0               # via graphene, graphql-core, graphql-relay, python-multipart, tenacity
+sqlalchemy[postgresql_psycopg2binary]==1.3.13  # via -r requirements/../../../packages/postgres-database/requirements/_base.in, aiopg
 starlette==0.12.9         # via fastapi
-tenacity==6.0.0
+tenacity==6.0.0           # via -r requirements/_base.in
 ujson==1.35               # via fastapi
 urllib3==1.25.8           # via requests
 uvicorn==0.11.2           # via fastapi
 uvloop==0.14.0            # via uvicorn
 websockets==8.1           # via uvicorn
-yarl==1.4.2
+yarl==1.4.2               # via -r requirements/../../../packages/postgres-database/requirements/_base.in
diff --git a/services/catalog/requirements/_test.txt b/services/catalog/requirements/_test.txt
index 38fce1f524a..f2b0284c413 100644
--- a/services/catalog/requirements/_test.txt
+++ b/services/catalog/requirements/_test.txt
@@ -55,7 +55,7 @@ pytest-cov==2.8.1         # via -r requirements/_test.in
 pytest-docker==0.7.2      # via -r requirements/_test.in
 pytest-mock==2.0.0        # via -r requirements/_test.in
 pytest-runner==5.2        # via -r requirements/_test.in
-pytest==5.4.2             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-mock
+pytest==5.4.3             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-mock
 python-dateutil==2.8.1    # via faker
 python-multipart==0.0.5   # via -r requirements/_base.txt, fastapi
 pyyaml==5.3               # via -r requirements/_base.txt, fastapi
diff --git a/services/director/requirements/_base.txt b/services/director/requirements/_base.txt
index 7b75d5a67a4..8bbde554451 100644
--- a/services/director/requirements/_base.txt
+++ b/services/director/requirements/_base.txt
@@ -2,14 +2,14 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=_base.txt _base.in
+#    pip-compile --output-file=requirements/_base.txt requirements/_base.in
 #
-aiodocker==0.14.0         # via -r _base.in
-aiohttp==3.3.2            # via -r _base.in, aiodocker, aiohttp-apiset
-git+https://github.com/ITISFoundation/aiohttp_apiset.git@fixes_4_osparc#egg=aiohttp_apiset  # via -r _base.in
+aiodocker==0.14.0         # via -r requirements/_base.in
+aiohttp==3.3.2            # via -r requirements/_base.in, aiodocker, aiohttp-apiset
+git+https://github.com/ITISFoundation/aiohttp_apiset.git@fixes_4_osparc#egg=aiohttp_apiset  # via -r requirements/_base.in
 async-generator==1.10     # via asyncio-extras
 async-timeout==3.0.1      # via aiohttp
-asyncio-extras==1.3.2     # via -r _base.in
+asyncio-extras==1.3.2     # via -r requirements/_base.in
 attrs==19.1.0             # via aiohttp
 certifi==2019.3.9         # via requests
 chardet==3.0.4            # via aiohttp, requests
@@ -17,9 +17,9 @@ idna-ssl==1.1.0           # via aiohttp
 idna==2.8                 # via idna-ssl, requests, yarl
 jsonschema==2.6.0         # via aiohttp-apiset
 multidict==4.5.2          # via aiohttp, yarl
-pyyaml==5.3               # via -r _base.in, aiohttp-apiset
-requests==2.22.0          # via -r _base.in
+pyyaml==5.3               # via -r requirements/_base.in, aiohttp-apiset
+requests==2.22.0          # via -r requirements/_base.in
 six==1.12.0               # via tenacity
-tenacity==6.0.0           # via -r _base.in
-urllib3==1.25.8           # via -r _base.in, requests
+tenacity==6.0.0           # via -r requirements/_base.in
+urllib3==1.25.8           # via -r requirements/_base.in, requests
 yarl==1.3.0               # via aiodocker, aiohttp
diff --git a/services/director/requirements/_test.txt b/services/director/requirements/_test.txt
index ae1cdc4d8aa..7287ca395a7 100644
--- a/services/director/requirements/_test.txt
+++ b/services/director/requirements/_test.txt
@@ -41,7 +41,7 @@ pytest-instafail==0.4.1.post0  # via -r requirements/_test.in
 pytest-mock==2.0.0        # via -r requirements/_test.in
 pytest-runner==5.2        # via -r requirements/_test.in
 pytest-sugar==0.9.2       # via -r requirements/_test.in
-pytest==5.4.2             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
+pytest==5.4.3             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
 pyyaml==5.3               # via -r requirements/_base.txt, aiohttp-apiset, openapi-spec-validator
 requests==2.22.0          # via -r requirements/_base.txt, codecov, coveralls, docker
 six==1.12.0               # via -r requirements/_base.txt, astroid, docker, openapi-spec-validator, packaging, tenacity, websocket-client
diff --git a/services/director/src/simcore_service_director/producer.py b/services/director/src/simcore_service_director/producer.py
index f819b862893..e02dc814c11 100644
--- a/services/director/src/simcore_service_director/producer.py
+++ b/services/director/src/simcore_service_director/producer.py
@@ -44,6 +44,7 @@ async def _check_node_uuid_available(
     log.debug("Checked if UUID %s is already in use", node_uuid)
     # check if service with same uuid already exists
     try:
+        # not filtering by "swarm_stack_name" label because it's safer
         list_of_running_services_w_uuid = await client.services.list(
             filters={"label": "uuid=" + node_uuid}
         )
@@ -812,7 +813,7 @@ async def get_services_details(
 ) -> List[Dict]:
     async with docker_utils.docker_client() as client:  # pylint: disable=not-async-context-manager
         try:
-            filters = ["type=main"]
+            filters = ["type=main", f"swarm_stack_name={config.SWARM_STACK_NAME}"]
             if user_id:
                 filters.append("user_id=" + user_id)
             if study_id:
@@ -844,7 +845,7 @@ async def get_service_details(app: web.Application, node_uuid: str) -> Dict:
                     "label": [
                         f"uuid={node_uuid}",
                         "type=main",
-                        f"swarm_stack_name={config.SWARM_STACK_NAME}"
+                        f"swarm_stack_name={config.SWARM_STACK_NAME}",
                     ]
                 }
             )
@@ -875,7 +876,12 @@ async def stop_service(app: web.Application, node_uuid: str) -> None:
     async with docker_utils.docker_client() as client:  # pylint: disable=not-async-context-manager
         try:
             list_running_services_with_uuid = await client.services.list(
-                filters={"label": "uuid=" + node_uuid}
+                filters={
+                    "label": [
+                        f"uuid={node_uuid}",
+                        f"swarm_stack_name={config.SWARM_STACK_NAME}",
+                    ]
+                }
             )
         except aiodocker.exceptions.DockerError as err:
             log.exception("Error while stopping container with uuid: %s", node_uuid)
diff --git a/services/docker-compose.yml b/services/docker-compose.yml
index fcbc8954b07..78d68183cfa 100644
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -240,7 +240,9 @@ services:
       - "--entryPoints.metrics.address=:8082"
       - "--metrics.prometheus.entryPoint=metrics"
       - "--entryPoints.http.address=:80"
+      - "--entryPoints.http.forwardedHeaders.insecure"
       - "--entryPoints.traefik_monitor.address=:8080"
+      - "--entryPoints.traefik_monitor.forwardedHeaders.insecure"
       - "--providers.docker.endpoint=unix:///var/run/docker.sock"
       - "--providers.docker.network=${SWARM_STACK_NAME}_default"
       - "--providers.docker.swarmMode=true"
diff --git a/services/sidecar/requirements/_base.txt b/services/sidecar/requirements/_base.txt
index c24aabaea50..ee2762e9fcb 100644
--- a/services/sidecar/requirements/_base.txt
+++ b/services/sidecar/requirements/_base.txt
@@ -2,40 +2,40 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=_base.txt _base.in
+#    pip-compile --output-file=requirements/_base.txt requirements/_base.in
 #
-aio-pika==6.6.0           # via -r _base.in
-aiodocker==0.17.0         # via -r _base.in
-aiofiles==0.4.0           # via -r _base.in
+aio-pika==6.6.0           # via -r requirements/_base.in
+aiodocker==0.17.0         # via -r requirements/_base.in
+aiofiles==0.4.0           # via -r requirements/_base.in
 aiohttp==3.6.2            # via aiodocker
-aiopg==1.0.0              # via -r _base.in
+aiopg==1.0.0              # via -r requirements/_base.in
 aiormq==3.2.1             # via aio-pika
 amqp==2.5.2               # via kombu
 async-timeout==3.0.1      # via aiohttp
 attrs==19.3.0             # via aiohttp
 billiard==3.6.3.0         # via celery
-celery==4.4.2             # via -r _base.in
+celery==4.4.2             # via -r requirements/_base.in
 chardet==3.0.4            # via aiohttp
-click==7.1.1              # via -r _base.in
+click==7.1.1              # via -r requirements/_base.in
 dataclasses==0.7          # via pydantic
 decorator==4.4.2          # via networkx
 idna-ssl==1.1.0           # via aiohttp
 idna==2.9                 # via yarl
 importlib-metadata==1.5.0  # via kombu
-kombu==4.6.8              # via -r _base.in, celery
+kombu==4.6.8              # via -r requirements/_base.in, celery
 multidict==4.7.5          # via aiohttp, yarl
-networkx==2.4             # via -r _base.in
-packaging==20.3           # via -r _base.in
+networkx==2.4             # via -r requirements/_base.in
+packaging==20.3           # via -r requirements/_base.in
 pamqp==2.3.0              # via aiormq
 psycopg2-binary==2.8.4    # via aiopg
-pydantic==1.4             # via -r _base.in
+pydantic==1.4             # via -r requirements/_base.in
 pyparsing==2.4.6          # via packaging
 pytz==2019.3              # via celery
 six==1.14.0               # via packaging, tenacity
-sqlalchemy==1.3.15        # via -r _base.in
-tenacity==6.1.0           # via -r _base.in
+sqlalchemy==1.3.15        # via -r requirements/_base.in
+tenacity==6.1.0           # via -r requirements/_base.in
 typing-extensions==3.7.4.1  # via aiohttp
-urllib3==1.25.8           # via -r _base.in
+urllib3==1.25.8           # via -r requirements/_base.in
 vine==1.3.0               # via amqp, celery
 yarl==1.4.2               # via aio-pika, aiohttp, aiormq
 zipp==3.1.0               # via importlib-metadata
diff --git a/services/sidecar/requirements/_test.txt b/services/sidecar/requirements/_test.txt
index b152227564d..28090520cb0 100644
--- a/services/sidecar/requirements/_test.txt
+++ b/services/sidecar/requirements/_test.txt
@@ -49,7 +49,7 @@ pytest-cov==2.8.1         # via -r requirements/_test.in
 pytest-instafail==0.4.1.post0  # via -r requirements/_test.in
 pytest-mock==2.0.0        # via -r requirements/_test.in
 pytest-sugar==0.9.2       # via -r requirements/_test.in
-pytest==5.4.2             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
+pytest==5.4.3             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
 pytz==2019.3              # via -r requirements/_base.txt, celery
 requests==2.23.0          # via coveralls, docker
 six==1.14.0               # via -r requirements/_base.txt, astroid, docker, packaging, tenacity, websocket-client
diff --git a/services/storage/requirements/_base.txt b/services/storage/requirements/_base.txt
index 8137acc4273..c9d177c9733 100644
--- a/services/storage/requirements/_base.txt
+++ b/services/storage/requirements/_base.txt
@@ -2,21 +2,21 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --build-isolation _base.in
+#    pip-compile --output-file=requirements/_base.txt requirements/_base.in
 #
-aioboto3==6.4.1           # via -r _base.in
+aioboto3==6.4.1           # via -r requirements/_base.in
 aiobotocore[boto3]==0.10.4  # via aioboto3
-aiodebug==1.1.2           # via -r ../../../packages/service-library/requirements/_base.in
-aiofiles==0.4.0           # via -r _base.in
-aiohttp==3.6.2            # via -r ../../../packages/service-library/requirements/_base.in, -r _base.in, aiobotocore, aiozipkin
-aiopg[sa]==1.0.0          # via -r ../../../packages/service-library/requirements/_base.in, -r _base.in
-aiozipkin==0.6.0          # via -r ../../../packages/service-library/requirements/_base.in
+aiodebug==1.1.2           # via -r requirements/../../../packages/service-library/requirements/_base.in
+aiofiles==0.4.0           # via -r requirements/_base.in
+aiohttp==3.6.2            # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in, aiobotocore, aiozipkin
+aiopg[sa]==1.0.0          # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in
+aiozipkin==0.6.0          # via -r requirements/../../../packages/service-library/requirements/_base.in
 apipkg==1.5               # via execnet
 async-generator==1.10     # via aiobotocore
 async-timeout==3.0.1      # via aiohttp
-attrs==19.1.0             # via -r ../../../packages/service-library/requirements/_base.in, aiohttp, jsonschema, openapi-core
-blackfynn==2.11.1         # via -r _base.in
-boto3==1.9.252            # via -r _base.in, aiobotocore, blackfynn
+attrs==19.1.0             # via -r requirements/../../../packages/service-library/requirements/_base.in, aiohttp, jsonschema, openapi-core
+blackfynn==2.11.1         # via -r requirements/_base.in
+boto3==1.9.252            # via -r requirements/_base.in, aiobotocore, blackfynn
 botocore==1.12.252        # via aiobotocore, boto3, s3transfer
 certifi==2019.3.9         # via requests
 chardet==3.0.4            # via aiohttp, requests
@@ -24,47 +24,47 @@ configparser==3.7.4       # via blackfynn
 deprecated==1.2.5         # via blackfynn
 docopt==0.6.2             # via blackfynn
 docutils==0.15.2          # via botocore
-execnet==1.6.0            # via -r _base.in
+execnet==1.6.0            # via -r requirements/_base.in
 future==0.17.1            # via blackfynn
 idna-ssl==1.1.0           # via aiohttp
 idna==2.8                 # via idna-ssl, requests, yarl
 importlib-metadata==1.3.0  # via jsonschema
 isodate==0.6.0            # via openapi-core
 jmespath==0.9.4           # via boto3, botocore
-jsonschema==3.2.0         # via -r ../../../packages/service-library/requirements/_base.in, openapi-spec-validator
+jsonschema==3.2.0         # via -r requirements/../../../packages/service-library/requirements/_base.in, openapi-spec-validator
 lazy-object-proxy==1.4.3  # via openapi-core
-marshmallow==2.19.2       # via -r _base.in
+marshmallow==2.19.2       # via -r requirements/_base.in
 more-itertools==8.0.2     # via zipp
 multidict==4.5.2          # via aiohttp, yarl
-numpy==1.16.3             # via -r python-with-pandas_89f709.txt, blackfynn, pandas
-openapi-core==0.12.0      # via -r ../../../packages/service-library/requirements/_base.in
+numpy==1.16.3             # via -r requirements/python-with-pandas_89f709.txt, blackfynn, pandas
+openapi-core==0.12.0      # via -r requirements/../../../packages/service-library/requirements/_base.in
 openapi-spec-validator==0.2.8  # via openapi-core
-pandas==0.24.2            # via -r python-with-pandas_89f709.txt, blackfynn
-prometheus-client==0.7.1  # via -r ../../../packages/service-library/requirements/_base.in
+pandas==0.24.2            # via -r requirements/python-with-pandas_89f709.txt, blackfynn
+prometheus-client==0.7.1  # via -r requirements/../../../packages/service-library/requirements/_base.in
 protobuf==3.2.0           # via blackfynn
-psutil==5.7.0             # via -r _base.in, blackfynn
-psycopg2-binary==2.8.4    # via -r ../../../packages/service-library/requirements/_base.in, -r _base.in, aiopg, sqlalchemy
+psutil==5.7.0             # via -r requirements/_base.in, blackfynn
+psycopg2-binary==2.8.4    # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in, aiopg, sqlalchemy
 pyrsistent==0.15.6        # via jsonschema
-python-dateutil==2.8.0    # via -r python-with-pandas_89f709.txt, botocore, pandas
-pytz==2019.1              # via -r python-with-pandas_89f709.txt, blackfynn, pandas
-pyyaml==5.3               # via -r ../../../packages/service-library/requirements/_base.in, openapi-spec-validator, trafaret-config
+python-dateutil==2.8.0    # via -r requirements/python-with-pandas_89f709.txt, botocore, pandas
+pytz==2019.1              # via -r requirements/python-with-pandas_89f709.txt, blackfynn, pandas
+pyyaml==5.3               # via -r requirements/../../../packages/service-library/requirements/_base.in, openapi-spec-validator, trafaret-config
 requests==2.22.0          # via blackfynn
 s3transfer==0.2.1         # via boto3
-semantic-version==2.6.0   # via -r _base.in
+semantic-version==2.6.0   # via -r requirements/_base.in
 semver==2.8.1             # via blackfynn
-six==1.12.0               # via -r python-with-pandas_89f709.txt, isodate, jsonschema, openapi-core, openapi-spec-validator, protobuf, pyrsistent, python-dateutil, tenacity, websocket-client
-sqlalchemy[postgresql_psycopg2binary]==1.3.3  # via -r ../../../packages/postgres-database/requirements/_base.in, -r ../../../packages/service-library/requirements/_base.in, -r _base.in, aiopg
+six==1.12.0               # via -r requirements/python-with-pandas_89f709.txt, isodate, jsonschema, openapi-core, openapi-spec-validator, protobuf, pyrsistent, python-dateutil, tenacity, websocket-client
+sqlalchemy[postgresql_psycopg2binary]==1.3.3  # via -r requirements/../../../packages/postgres-database/requirements/_base.in, -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in, aiopg
 strict-rfc3339==0.7       # via openapi-core
-tenacity==6.0.0           # via -r ../../../packages/service-library/requirements/_base.in, -r _base.in
-trafaret-config==2.0.2    # via -r _base.in
-trafaret==2.0.2           # via -r ../../../packages/service-library/requirements/_base.in, -r _base.in, trafaret-config
+tenacity==6.0.0           # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in
+trafaret-config==2.0.2    # via -r requirements/_base.in
+trafaret==2.0.2           # via -r requirements/../../../packages/service-library/requirements/_base.in, -r requirements/_base.in, trafaret-config
 typing-extensions==3.7.2  # via aiohttp
-ujson==1.35               # via -r ../../../packages/service-library/requirements/_base.in
-urllib3==1.25.8           # via -r _base.in, botocore, requests
+ujson==1.35               # via -r requirements/../../../packages/service-library/requirements/_base.in
+urllib3==1.25.8           # via -r requirements/_base.in, botocore, requests
 websocket-client==0.56.0  # via blackfynn
-werkzeug==0.16.0          # via -r ../../../packages/service-library/requirements/_base.in
+werkzeug==0.16.0          # via -r requirements/../../../packages/service-library/requirements/_base.in
 wrapt==1.11.2             # via aiobotocore, deprecated
-yarl==1.3.0               # via -r ../../../packages/postgres-database/requirements/_base.in, aiohttp
+yarl==1.3.0               # via -r requirements/../../../packages/postgres-database/requirements/_base.in, aiohttp
 zipp==0.6.0               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/services/storage/requirements/_test.txt b/services/storage/requirements/_test.txt
index efb9ce028d9..74cf7e58b66 100644
--- a/services/storage/requirements/_test.txt
+++ b/services/storage/requirements/_test.txt
@@ -68,7 +68,7 @@ pytest-instafail==0.4.1.post0  # via -r requirements/_test.in
 pytest-mock==2.0.0        # via -r requirements/_test.in
 pytest-runner==5.2        # via -r requirements/_test.in
 pytest-sugar==0.9.2       # via -r requirements/_test.in
-pytest==5.4.2             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
+pytest==5.4.3             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
 python-dateutil==2.8.0    # via -r requirements/_base.txt, botocore, pandas
 pytz==2019.1              # via -r requirements/_base.txt, blackfynn, pandas
 pyyaml==5.3               # via -r requirements/_base.txt, openapi-spec-validator, trafaret-config
diff --git a/services/web/server/requirements/_test.txt b/services/web/server/requirements/_test.txt
index 3487dd072fb..006ae8d7cb1 100644
--- a/services/web/server/requirements/_test.txt
+++ b/services/web/server/requirements/_test.txt
@@ -74,7 +74,7 @@ pytest-instafail==0.4.1.post0  # via -r requirements/_test.in
 pytest-mock==3.1.0        # via -r requirements/_test.in
 pytest-runner==5.2        # via -r requirements/_test.in
 pytest-sugar==0.9.3       # via -r requirements/_test.in
-pytest==5.4.2             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
+pytest==5.4.3             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
 python-dateutil==2.8.1    # via faker
 python-engineio==3.13.0   # via -r requirements/_base.txt, python-socketio
 python-socketio==4.6.0    # via -r requirements/_base.txt
diff --git a/services/web/server/src/simcore_service_webserver/config/server-docker-prod.yaml b/services/web/server/src/simcore_service_webserver/config/server-docker-prod.yaml
index be56f847966..2b3cd871c4e 100644
--- a/services/web/server/src/simcore_service_webserver/config/server-docker-prod.yaml
+++ b/services/web/server/src/simcore_service_webserver/config/server-docker-prod.yaml
@@ -32,7 +32,7 @@ db:
     host: ${POSTGRES_HOST}
     port: ${POSTGRES_PORT}
     minsize: 4
-    maxsize: 4
+    maxsize: 15
 resource_manager:
   enabled: True
   resource_deletion_timeout_seconds: ${WEBSERVER_RESOURCES_DELETION_TIMEOUT_SECONDS}
diff --git a/services/web/server/src/simcore_service_webserver/projects/projects_api.py b/services/web/server/src/simcore_service_webserver/projects/projects_api.py
index 2020d4b1271..23f7502f01b 100644
--- a/services/web/server/src/simcore_service_webserver/projects/projects_api.py
+++ b/services/web/server/src/simcore_service_webserver/projects/projects_api.py
@@ -289,9 +289,9 @@ async def update_project_node_outputs(
         raise NodeNotFoundError(project_id, node_id)
 
     if data:
-        # NOTE: update outputs if necessary as the UI expects a
+        # NOTE: update outputs (not required) if necessary as the UI expects a
         # dataset/label field that is missing
-        outputs: Dict[str,Any] = project["workbench"][node_id]["outputs"]
+        outputs: Dict[str,Any] = project["workbench"][node_id].setdefault("outputs", {})
         outputs.update(data)
 
         for output_key in outputs.keys():
diff --git a/tests/swarm-deploy/requirements/requirements.txt b/tests/swarm-deploy/requirements/requirements.txt
index 262f8f097a0..7f356bd52b0 100644
--- a/tests/swarm-deploy/requirements/requirements.txt
+++ b/tests/swarm-deploy/requirements/requirements.txt
@@ -12,7 +12,7 @@ attrs==19.3.0             # via aiohttp, pytest
 certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via aiohttp, requests
 coverage==5.1             # via -r requirements/requirements.in, pytest-cov
-docker==4.2.0             # via -r requirements/requirements.in
+docker==4.2.1             # via -r requirements/requirements.in
 idna-ssl==1.1.0           # via aiohttp
 idna==2.9                 # via requests, yarl
 importlib-metadata==1.6.0  # via pluggy, pytest
@@ -29,7 +29,7 @@ pytest-instafail==0.4.1.post0  # via -r requirements/requirements.in
 pytest-mock==3.1.0        # via -r requirements/requirements.in
 pytest-runner==5.2        # via -r requirements/requirements.in
 pytest-sugar==0.9.3       # via -r requirements/requirements.in
-pytest==5.4.2             # via -r requirements/requirements.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
+pytest==5.4.3             # via -r requirements/requirements.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
 pyyaml==5.3.1             # via -r requirements/requirements.in
 requests==2.23.0          # via docker
 six==1.15.0               # via docker, packaging, tenacity, websocket-client