diff --git a/postgres.json b/postgres.json
index 6bd73896..1654910a 100644
--- a/postgres.json
+++ b/postgres.json
@@ -1,34 +1,5 @@
 {
-   "cap_add" : null,
-   "cap_drop" : null,
-   "cmd" : "postgres",
-   "cpu_priority" : 50,
-   "devices" : null,
-   "enable_publish_all_ports" : false,
-   "enable_restart_policy" : true,
-   "enabled" : true,
-   "entrypoint_default" : "docker-entrypoint.sh",
    "env_variables" : [
-      {
-         "key" : "PATH",
-         "value" : "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/postgresql/10/bin"
-      },
-      {
-         "key" : "GOSU_VERSION",
-         "value" : "1.10"
-      },
-      {
-         "key" : "LANG",
-         "value" : "en_US.utf8"
-      },
-      {
-         "key" : "PG_MAJOR",
-         "value" : "10"
-      },
-      {
-         "key" : "PG_VERSION",
-         "value" : "10.5-2.pgdg90+1"
-      },
       {
          "key" : "PGDATA",
          "value" : "/var/lib/postgresql/data"
@@ -46,40 +17,13 @@
          "value" : "1234"
       }
    ],
-   "exporting" : false,
-   "id" : "31b1f071e4f98c6ab607fc105013675c1575b4fc8abd406553cfb92cc909af29",
-   "image" : "postgres:10",
-   "is_ddsm" : false,
-   "is_package" : false,
-   "links" : [],
-   "memory_limit" : 0,
+   "image" : "postgres:12",
    "name" : "postgres",
-   "network" : [
-      {
-         "driver" : "bridge",
-         "name" : "bridge"
-      }
-   ],
-   "network_mode" : "bridge",
-   "port_bindings" : [
-      {
-         "container_port" : 5432,
-         "host_port" : 0,
-         "type" : "tcp"
-      }
-   ],
-   "privileged" : false,
-   "shortcut" : {
-      "enable_shortcut" : false
-   },
-   "ulimits" : null,
-   "use_host_network" : false,
    "volume_bindings" : [
       {
          "host_volume_file" : "/paperless/pgdata",
          "mount_point" : "/var/lib/postgresql/data",
          "type" : "rw"
       }
-   ],
-   "volumes_from" : null
+   ]
 }
diff --git a/sbrunner-scan-to-paperless-debug.json b/sbrunner-scan-to-paperless-debug.json
deleted file mode 100644
index 7d1cd594..00000000
--- a/sbrunner-scan-to-paperless-debug.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-   "cap_add" : [],
-   "cap_drop" : [],
-   "cmd" : "/opt/process",
-   "cpu_priority" : 50,
-   "devices" : null,
-   "enable_publish_all_ports" : false,
-   "enable_restart_policy" : true,
-   "enabled" : false,
-   "env_variables" : [
-      {
-         "key" : "LANG",
-         "value" : "C.UTF-8"
-      },
-      {
-         "key" : "PROGRESS",
-         "value" : "TRUE"
-      }
-   ],
-   "exporting" : false,
-   "id" : "3b6322a6058f8a6a02d23157c8e8dd724e136a2c59cc7c1e0b34e13d496fb973",
-   "image" : "sbrunner/scan-to-paperless:latest",
-   "is_ddsm" : false,
-   "is_package" : false,
-   "links" : [],
-   "memory_limit" : 0,
-   "name" : "sbrunner-scan-to-paperless-debug",
-   "network" : [
-      {
-         "driver" : "bridge",
-         "name" : "bridge"
-      }
-   ],
-   "network_mode" : "bridge",
-   "port_bindings" : [],
-   "privileged" : false,
-   "shortcut" : {
-      "enable_shortcut" : false
-   },
-   "ulimits" : null,
-   "use_host_network" : false,
-   "volume_bindings" : [
-      {
-         "host_volume_file" : "/paperless/scan-debug",
-         "mount_point" : "/source",
-         "type" : "rw"
-      },
-      {
-         "host_volume_file" : "/paperless/consume",
-         "mount_point" : "/destination",
-         "type" : "rw"
-      }
-   ],
-   "volumes_from" : null
-}
diff --git a/sbrunner-scan-to-paperless-test.json b/sbrunner-scan-to-paperless-test.json
index f2e0dbea..362e8b20 100644
--- a/sbrunner-scan-to-paperless-test.json
+++ b/sbrunner-scan-to-paperless-test.json
@@ -1,17 +1,5 @@
 {
-   "cap_add" : [],
-   "cap_drop" : [],
-   "cmd" : "/opt/process",
-   "cpu_priority" : 50,
-   "devices" : null,
-   "enable_publish_all_ports" : false,
-   "enable_restart_policy" : true,
-   "enabled" : false,
    "env_variables" : [
-      {
-         "key" : "LANG",
-         "value" : "C.UTF-8"
-      },
       {
          "key" : "PROGRESS",
          "value" : "TRUE"
@@ -21,36 +9,16 @@
          "value" : "TRUE"
       }
    ],
-   "exporting" : false,
-   "id" : "3b6322a6058f8a6a02d23157c8e8dd724e136a2c59cc7c1e0b34e13d496fb973",
    "image" : "sbrunner/scan-to-paperless:test",
-   "is_ddsm" : false,
-   "is_package" : false,
-   "links" : [],
-   "memory_limit" : 0,
    "name" : "sbrunner-scan-to-paperless-test",
-   "network" : [
-      {
-         "driver" : "bridge",
-         "name" : "bridge"
-      }
-   ],
-   "network_mode" : "bridge",
-   "port_bindings" : [],
-   "privileged" : false,
-   "shortcut" : {
-      "enable_shortcut" : false
-   },
-   "ulimits" : null,
-   "use_host_network" : false,
    "volume_bindings" : [
       {
-         "host_volume_file" : "/paperless/scan-test",
+         "host_volume_file" : "/paperless/test/scan",
          "mount_point" : "/source",
          "type" : "rw"
       },
       {
-         "host_volume_file" : "/paperless/consume",
+         "host_volume_file" : "/paperless/test/consume",
          "mount_point" : "/destination",
          "type" : "rw"
       }
diff --git a/sbrunner-scan-to-paperless.json b/sbrunner-scan-to-paperless.json
index 9ff32515..8696b364 100644
--- a/sbrunner-scan-to-paperless.json
+++ b/sbrunner-scan-to-paperless.json
@@ -1,50 +1,6 @@
 {
-   "cap_add" : [],
-   "cap_drop" : [],
-   "cmd" : "/opt/process",
-   "cpu_priority" : 50,
-   "devices" : null,
-   "enable_publish_all_ports" : false,
-   "enable_restart_policy" : true,
-   "enabled" : false,
-   "env_variables" : [
-      {
-         "key" : "PATH",
-         "value" : "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      },
-      {
-         "key" : "DEBIAN_FRONTEND",
-         "value" : "noninteractive"
-      },
-      {
-         "key" : "LANG",
-         "value" : "C.UTF-8"
-      }
-   ],
-   "exporting" : false,
-   "id" : "082462f4f7ed0de9be6724d84ea5073d694a545778c521637fd3700a63778203",
    "image" : "sbrunner/scan-to-paperless:latest",
-   "is_ddsm" : false,
-   "is_package" : false,
-   "links" : [],
-   "memory_limit" : 0,
    "name" : "sbrunner-scan-to-paperless",
-   "network" : [
-      {
-         "driver" : "bridge",
-         "name" : "bridge"
-      }
-   ],
-   "network_mode" : "bridge",
-   "port_bindings" : [],
-   "privileged" : false,
-   "shortcut" : {
-      "enable_shortcut" : false,
-      "enable_status_page" : false,
-      "enable_web_page" : false,
-      "web_page_url" : ""
-   },
-   "use_host_network" : false,
    "volume_bindings" : [
       {
          "host_volume_file" : "/paperless/scan",
diff --git a/thepaperlessproject-paperless-consumer.json b/thepaperlessproject-paperless-consumer.json
index 08b7cee6..81da4f9e 100644
--- a/thepaperlessproject-paperless-consumer.json
+++ b/thepaperlessproject-paperless-consumer.json
@@ -1,16 +1,9 @@
 {
-   "cap_add" : [],
-   "cap_drop" : [],
    "cmd" : "document_consumer",
-   "cpu_priority" : 10,
-   "devices" : null,
-   "enable_publish_all_ports" : false,
-   "enable_restart_policy" : true,
-   "enabled" : true,
    "env_variables" : [
       {
-         "key" : "PATH",
-         "value" : "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+         "key" : "TZ",
+         "value" : "Europe/Zurich"
       },
       {
          "key" : "PAPERLESS_EXPORT_DIR",
@@ -59,34 +52,20 @@
       {
          "key" : "PAPERLESS_FORGIVING_OCR",
          "value" : "true"
+      },
+      {
+         "key" : "PAPERLESS_FILENAME_FORMAT",
+         "value" : "{correspondent}/{title}-{created}"
       }
    ],
-   "exporting" : false,
-   "id" : "1d5146d6c896bc58289c845478ec4b166d2059b9766ead6d1759b6c2c1f23e98",
    "image" : "thepaperlessproject/paperless:latest",
-   "is_ddsm" : false,
-   "is_package" : false,
    "links" : [
       {
          "alias" : "postgres",
          "link_container" : "postgres"
       }
    ],
-   "memory_limit" : 4294967296,
    "name" : "thepaperlessproject-paperless-consumer",
-   "network" : [
-      {
-         "driver" : "bridge",
-         "name" : "bridge"
-      }
-   ],
-   "network_mode" : "bridge",
-   "port_bindings" : [],
-   "privileged" : false,
-   "shortcut" : {
-      "enable_shortcut" : false
-   },
-   "use_host_network" : false,
    "volume_bindings" : [
       {
          "host_volume_file" : "/paperless/dumpdata",
diff --git a/thepaperlessproject-paperless-webserver.json b/thepaperlessproject-paperless-webserver.json
index 3116dff1..5ea2345a 100644
--- a/thepaperlessproject-paperless-webserver.json
+++ b/thepaperlessproject-paperless-webserver.json
@@ -1,16 +1,8 @@
 {
-   "cap_add" : [],
-   "cap_drop" : [],
-   "cmd" : "runserver --insecure --noreload 0.0.0.0:8000",
-   "cpu_priority" : 50,
-   "devices" : null,
-   "enable_publish_all_ports" : false,
-   "enable_restart_policy" : true,
-   "enabled" : true,
    "env_variables" : [
       {
-         "key" : "PATH",
-         "value" : "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+         "key" : "TZ",
+         "value" : "Europe/Zurich"
       },
       {
          "key" : "PAPERLESS_EXPORT_DIR",
@@ -51,28 +43,20 @@
       {
          "key" : "PAPERLESS_INLINE_DOC",
          "value" : "true"
+      },
+      {
+         "key" : "PAPERLESS_FILENAME_FORMAT",
+         "value" : "{correspondent}/{title}-{created}"
       }
    ],
-   "exporting" : false,
-   "id" : "86b2500737e457de61b6805c90cce72fa6b9aa6e92fe37ea17b5edfff70036ff",
    "image" : "thepaperlessproject/paperless:latest",
-   "is_ddsm" : false,
-   "is_package" : false,
    "links" : [
       {
          "alias" : "postgres",
          "link_container" : "postgres"
       }
    ],
-   "memory_limit" : 0,
    "name" : "thepaperlessproject-paperless-webserver",
-   "network" : [
-      {
-         "driver" : "bridge",
-         "name" : "bridge"
-      }
-   ],
-   "network_mode" : "bridge",
    "port_bindings" : [
       {
          "container_port" : 8000,
@@ -80,11 +64,6 @@
          "type" : "tcp"
       }
    ],
-   "privileged" : false,
-   "shortcut" : {
-      "enable_shortcut" : false
-   },
-   "use_host_network" : false,
    "volume_bindings" : [
       {
          "host_volume_file" : "/paperless/dumpdata",