diff --git a/Dockerfile b/Dockerfile
index 7151761c0..57b293497 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM photoprism/development:20201211
+FROM photoprism/development:20201215
 
 # Set up project directory
 WORKDIR "/go/src/github.com/photoprism/photoprism"
diff --git a/docker-compose.drone.yml b/docker-compose.drone.yml
index 5f47323aa..b56cf53b3 100644
--- a/docker-compose.drone.yml
+++ b/docker-compose.drone.yml
@@ -29,7 +29,10 @@ services:
       PHOTOPRISM_HTTP_HOST: "0.0.0.0"
       PHOTOPRISM_HTTP_PORT: 2342
       PHOTOPRISM_DATABASE_DRIVER: "mysql"
-      PHOTOPRISM_DATABASE_DSN: "root:photoprism@tcp(photoprism-db:4001)/photoprism?charset=utf8mb4,utf8&parseTime=true"
+      PHOTOPRISM_DATABASE_SERVER: "photoprism-db:4001"
+      PHOTOPRISM_DATABASE_NAME: "photoprism"
+      PHOTOPRISM_DATABASE_USER: "root"
+      PHOTOPRISM_DATABASE_PASSWORD: "photoprism"
       PHOTOPRISM_TEST_DRIVER: "sqlite"
       PHOTOPRISM_TEST_DSN: ".test.db"
       PHOTOPRISM_ADMIN_PASSWORD: "photoprism"
diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml
index e175d983a..666d64eee 100644
--- a/docker-compose.postgres.yml
+++ b/docker-compose.postgres.yml
@@ -33,7 +33,10 @@ services:
       PHOTOPRISM_HTTP_HOST: "0.0.0.0"
       PHOTOPRISM_HTTP_PORT: 2342
       PHOTOPRISM_DATABASE_DRIVER: "postgres"
-      PHOTOPRISM_DATABASE_DSN: "user=photoprism password=photoprism dbname=photoprism host=postgres port=5432 sslmode=disable TimeZone=UTC"
+      PHOTOPRISM_DATABASE_SERVER: "postgres:5432"
+      PHOTOPRISM_DATABASE_NAME: "photoprism"
+      PHOTOPRISM_DATABASE_USER: "photoprism"
+      PHOTOPRISM_DATABASE_PASSWORD: "photoprism"
       PHOTOPRISM_TEST_DRIVER: "sqlite"
       PHOTOPRISM_TEST_DSN: ".test.db"
       PHOTOPRISM_ADMIN_PASSWORD: "photoprism"
diff --git a/docker-compose.yml b/docker-compose.yml
index fc02884c7..782eb9510 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,7 +48,10 @@ services:
       PHOTOPRISM_HTTP_HOST: "0.0.0.0"
       PHOTOPRISM_HTTP_PORT: 2342
       PHOTOPRISM_DATABASE_DRIVER: "mysql"
-      PHOTOPRISM_DATABASE_DSN: "root:photoprism@tcp(photoprism-db:4001)/photoprism?charset=utf8mb4,utf8&parseTime=true"
+      PHOTOPRISM_DATABASE_SERVER: "photoprism-db:4001"
+      PHOTOPRISM_DATABASE_NAME: "photoprism"
+      PHOTOPRISM_DATABASE_USER: "root"
+      PHOTOPRISM_DATABASE_PASSWORD: "photoprism"
       PHOTOPRISM_TEST_DRIVER: "sqlite"
       PHOTOPRISM_TEST_DSN: ".test.db"
       PHOTOPRISM_ADMIN_PASSWORD: "photoprism"
diff --git a/docker/photoprism/Dockerfile b/docker/photoprism/Dockerfile
index b163623a5..d0c8effa3 100644
--- a/docker/photoprism/Dockerfile
+++ b/docker/photoprism/Dockerfile
@@ -1,4 +1,4 @@
-FROM photoprism/development:20201211 as build
+FROM photoprism/development:20201215 as build
 
 # Set up project directory
 WORKDIR "/go/src/github.com/photoprism/photoprism"
diff --git a/docker/photoprism/arm64/docker-compose.yml b/docker/photoprism/arm64/docker-compose.yml
index 1d334993d..af26d7c45 100644
--- a/docker/photoprism/arm64/docker-compose.yml
+++ b/docker/photoprism/arm64/docker-compose.yml
@@ -46,8 +46,11 @@ services:
       PHOTOPRISM_HTTP_PORT: 2342
       PHOTOPRISM_SETTINGS_HIDDEN: "false"            # Users can not view or change settings
       PHOTOPRISM_DATABASE_DRIVER: "sqlite"           # SQLite is an embedded database that doesn't require a server
-      # PHOTOPRISM_DATABASE_DRIVER: "mysql"          # Use MariaDB (or MySQL) instead of SQLite for improved performance
-      # PHOTOPRISM_DATABASE_DSN: "photoprism:insecure@tcp(mariadb:3306)/photoprism?charset=utf8mb4,utf8&parseTime=true"
+      # PHOTOPRISM_DATABASE_DRIVER: "mysql"          # Use MariaDB instead of SQLite for improved performance
+      # PHOTOPRISM_DATABASE_SERVER: "mariadb:3306"
+      # PHOTOPRISM_DATABASE_NAME: "photoprism"
+      # PHOTOPRISM_DATABASE_USER: "photoprism"
+      # PHOTOPRISM_DATABASE_PASSWORD: "insecure"
       PHOTOPRISM_SIDECAR_JSON: "true"                # Automatically create JSON sidecar files using Exiftool
       PHOTOPRISM_SIDECAR_YAML: "true"                # Automatically backup metadata to YAML sidecar files
       PHOTOPRISM_THUMB_FILTER: "lanczos"             # Resample filter, best to worst: blackman, lanczos, cubic, linear
diff --git a/docker/photoprism/docker-compose.yml b/docker/photoprism/docker-compose.yml
index bbf5940ec..6e9037c70 100644
--- a/docker/photoprism/docker-compose.yml
+++ b/docker/photoprism/docker-compose.yml
@@ -46,8 +46,11 @@ services:
       PHOTOPRISM_HTTP_PORT: 2342
       PHOTOPRISM_SETTINGS_HIDDEN: "false"            # Users can not view or change settings
       PHOTOPRISM_DATABASE_DRIVER: "sqlite"           # SQLite is an embedded database that doesn't require a server
-      # PHOTOPRISM_DATABASE_DRIVER: "mysql"          # Use MariaDB (or MySQL) instead of SQLite for improved performance
-      # PHOTOPRISM_DATABASE_DSN: "photoprism:insecure@tcp(mariadb:3306)/photoprism?charset=utf8mb4,utf8&parseTime=true"
+      # PHOTOPRISM_DATABASE_DRIVER: "mysql"          # Use MariaDB instead of SQLite for improved performance
+      # PHOTOPRISM_DATABASE_SERVER: "mariadb:3306"
+      # PHOTOPRISM_DATABASE_NAME: "photoprism"
+      # PHOTOPRISM_DATABASE_USER: "photoprism"
+      # PHOTOPRISM_DATABASE_PASSWORD: "insecure"
       PHOTOPRISM_SIDECAR_JSON: "true"                # Automatically create JSON sidecar files using Exiftool
       PHOTOPRISM_SIDECAR_YAML: "true"                # Automatically backup metadata to YAML sidecar files
       PHOTOPRISM_THUMB_FILTER: "lanczos"             # Resample filter, best to worst: blackman, lanczos, cubic, linear