diff --git a/Dockerfile b/Dockerfile
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@
 RUN pip install \
         swh-core[db,http] \
         cassandra-driver \
-        swh-deposit \
+        swh-deposit[server] \
         swh-indexer \
         swh-journal \
         swh-lister \
diff --git a/docker-compose.yml b/docker-compose.yml
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -243,9 +243,12 @@
     depends_on:
       - swh-deposit-db
       - swh-scheduler-api
+    environment:
+      VERBOSITY: 3
+      SWH_CONFIG_FILENAME: /deposit.yml
+      DJANGO_SETTINGS_MODULE: swh.deposit.settings.production
     env_file:
       - ./env/deposit-db.env
-      - ./env/deposit.env
     entrypoint: /entrypoint.sh
     volumes:
       - "./conf/deposit.yml:/deposit.yml:ro"
diff --git a/env/deposit.env b/env/deposit.env
deleted file mode 100644
--- a/env/deposit.env
+++ /dev/null
@@ -1,2 +0,0 @@
-SWH_CONFIG_FILENAME=/deposit.yml
-DJANGO_SETTINGS_MODULE=swh.deposit.settings.production
diff --git a/services/swh-deposit/entrypoint.sh b/services/swh-deposit/entrypoint.sh
--- a/services/swh-deposit/entrypoint.sh
+++ b/services/swh-deposit/entrypoint.sh
@@ -15,7 +15,7 @@
     wait_pgsql
 
     echo "Migrating db"
-    django-admin migrate --settings=swh.deposit.settings.production
+    django-admin migrate --settings=${DJANGO_SETTINGS_MODULE}
 
     swh-deposit admin user exists test || \
         swh-deposit admin user create \
@@ -31,5 +31,5 @@
                   --workers 2 \
                   --log-level DEBUG \
                   --timeout 3600 \
-                  swh.deposit.wsgi
+                  'django.core.wsgi:get_wsgi_application()'
 fi
diff --git a/services/swh-indexer-storage/entrypoint.sh b/services/swh-indexer-storage/entrypoint.sh
--- a/services/swh-indexer-storage/entrypoint.sh
+++ b/services/swh-indexer-storage/entrypoint.sh
@@ -27,6 +27,6 @@
          --workers 2 \
          --log-level DEBUG \
          --timeout 3600 \
-         swh.indexer.storage.api.wsgi
+         'swh.indexer.storage.api.server:make_app_from_configfile()'
     ;;
 esac
diff --git a/services/swh-objstorage/entrypoint.sh b/services/swh-objstorage/entrypoint.sh
--- a/services/swh-objstorage/entrypoint.sh
+++ b/services/swh-objstorage/entrypoint.sh
@@ -19,6 +19,6 @@
        --workers 2 \
        --reload \
        --timeout 3600 \
-       swh.objstorage.api.wsgi
+       'swh.objstorage.api.server:make_app_from_configfile()'
 
 fi
diff --git a/services/swh-storage/entrypoint.sh b/services/swh-storage/entrypoint.sh
--- a/services/swh-storage/entrypoint.sh
+++ b/services/swh-storage/entrypoint.sh
@@ -40,6 +40,6 @@
            --workers 2 \
            --log-level DEBUG \
            --timeout 3600 \
-           swh.storage.api.wsgi
+           'swh.storage.api.server:make_app_from_configfile()'
       ;;
 esac
diff --git a/services/swh-web/entrypoint.sh b/services/swh-web/entrypoint.sh
--- a/services/swh-web/entrypoint.sh
+++ b/services/swh-web/entrypoint.sh
@@ -34,5 +34,5 @@
              --threads 2 \
              --workers 2 \
              --timeout 3600 \
-             swh.web.wsgi
+             'django.core.wsgi:get_wsgi_application()'
 esac