diff --git a/conf/deposit.yml b/conf/deposit.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5337bc1cdbfda3b051e97ea329c1366ebca6b042
--- /dev/null
+++ b/conf/deposit.yml
@@ -0,0 +1,14 @@
+scheduler:
+  cls: remote
+  args:
+    url: http://swh-scheduler:5008
+
+private:
+  secret_key: prod-in-docker
+  db:
+    host: swh-deposit-db
+    port: 5432
+    name: softwareheritage-deposit
+    user: postgres
+    password: testpassword
+  media_root: /tmp/swh-deposit/uploads
diff --git a/conf/deposit_private.yml b/conf/deposit_private.yml
deleted file mode 100644
index e3180a3f4f9026f5d2bd7317e0d3a11e8bc73175..0000000000000000000000000000000000000000
--- a/conf/deposit_private.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-secret_key: prod-in-docker
-db:
-  host: swh-deposit-db
-  port: 5432
-  name: softwareheritage-deposit
-  user: postgres
-  password: testpassword
-media_root: /tmp/swh-deposit/uploads
diff --git a/conf/deposit_server.yml b/conf/deposit_server.yml
deleted file mode 100644
index 8aeaacce4572e12dc6474659e01acafd36d40893..0000000000000000000000000000000000000000
--- a/conf/deposit_server.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-scheduler:
-  cls: remote
-  args:
-    url: http://swh-scheduler:5008
diff --git a/docker-compose.yml b/docker-compose.yml
index 85d2a25132965ce21267a2e0928e7b9706f58692..02e99b12d76fe46be7290dbfec9525d002016a1d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -195,8 +195,7 @@ services:
     environment:
       PGHOST: swh-deposit-db
     volumes:
-      - "./conf/deposit_server.yml:/etc/softwareheritage/deposit/server.yml:ro"
-      - "./conf/deposit_private.yml:/etc/softwareheritage/deposit/private.yml:ro"
+      - "./conf/deposit.yml:/deposit.yml:ro"
 
   swh-vault-db:
     image: postgres:10
diff --git a/dockerfiles/swh-deposit/loader.yml b/dockerfiles/swh-deposit/loader.yml
deleted file mode 100644
index a97e7ce6e224121ddf6ba7268630488ebb6f457f..0000000000000000000000000000000000000000
--- a/dockerfiles/swh-deposit/loader.yml
+++ /dev/null
@@ -1 +0,0 @@
-extraction_dir: /tmp/swh.deposit.loader/
diff --git a/env/deposit.env b/env/deposit.env
index bfd3b0423b45d11f8d17839ed204eb1d95c0ca41..29365b08af0452aafb117ead2ee406ed476837c6 100644
--- a/env/deposit.env
+++ b/env/deposit.env
@@ -1,3 +1,5 @@
 POSTGRES_DB=softwareheritage-deposit
 POSTGRES_PASSWORD=testpassword
 PGUSER=postgres
+SWH_CONFIG_FILENAME=/deposit.yml
+DJANGO_SETTINGS_MODULE=swh.deposit.settings.production
\ No newline at end of file