diff --git a/Dockerfile b/Dockerfile
index c06594c28..9b3849f4f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM photoprism/development:20211210
+FROM photoprism/develop:20211218
 
 # Copy latest entrypoint script
-COPY --chown=root:root /docker/development/entrypoint.sh /entrypoint.sh
+COPY --chown=root:root /docker/develop/entrypoint.sh /entrypoint.sh
 COPY --chown=root:root /docker/scripts/Makefile /root/Makefile
 
 # Set up project directory
diff --git a/docker-compose.latest.yml b/docker-compose.latest.yml
index 18f232284..48a0be0e4 100644
--- a/docker-compose.latest.yml
+++ b/docker-compose.latest.yml
@@ -65,8 +65,8 @@ services:
       - "./storage/latest:/photoprism/storage"
       - "./storage/originals:/photoprism/originals"
 
-## Join shared network
+## Join shared "photoprism-develop" network
 networks:
   default:
     external:
-      name: photoprism-dev
+      name: photoprism-develop
diff --git a/docker-compose.mariadb.yml b/docker-compose.mariadb.yml
index 73de13643..c098f9c90 100644
--- a/docker-compose.mariadb.yml
+++ b/docker-compose.mariadb.yml
@@ -93,7 +93,8 @@ services:
       MYSQL_PASSWORD: photoprism
       MYSQL_DATABASE: photoprism
 
+## Join shared "photoprism-develop" network
 networks:
   default:
     external:
-      name: photoprism-dev
+      name: photoprism-develop
diff --git a/docker-compose.yml b/docker-compose.yml
index 5672fd992..f54ce912a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -98,7 +98,7 @@ services:
       TF_CPP_MIN_LOG_LEVEL: 0                        # Show TensorFlow log messages for development
       ## OpenID Connect Provider (pre-configured for local Keycloak test server):
       PHOTOPRISM_OIDC_ISSUER_URL: "https://keycloak.traefik.net/auth/realms/master"
-      PHOTOPRISM_OIDC_CLIENT_ID: "photoprism-development"
+      PHOTOPRISM_OIDC_CLIENT_ID: "photoprism-develop"
       PHOTOPRISM_OIDC_CLIENT_SECRET: "9d8351a0-ca01-4556-9c37-85eb634869b9"
       ## Enable TensorFlow AVX2 support for modern Intel CPUs (requires starting the container as root):
       # PHOTOPRISM_INIT: "tensorflow-amd64-avx2"
@@ -204,13 +204,13 @@ services:
       - "traefik.http.routers.dummy-oidc.tls.domains[0].sans=*.traefik.net"
       - "traefik.http.routers.dummy-oidc.tls=true"
 
-## Create named volume for Go module cache.
+## Create named volume for Go module cache
 volumes:
   go-mod:
     driver: local
 
-## Create shared network for connecting with services in other docker-compose.yml files.
+## Create shared "photoprism-develop" network for connecting with services in other docker-compose.yml files
 networks:
   default:
-    name: photoprism-dev
+    name: photoprism-develop
     driver: bridge
diff --git a/docker/photoprism/Dockerfile b/docker/photoprism/Dockerfile
index 1fff56947..7368af73b 100644
--- a/docker/photoprism/Dockerfile
+++ b/docker/photoprism/Dockerfile
@@ -1,5 +1,5 @@
 ##################################################### BUILD STAGE ######################################################
-FROM photoprism/development:20211210 as build
+FROM photoprism/develop:20211218 as build
 
 ARG TARGETARCH
 ARG TARGETPLATFORM
diff --git a/docker/photoprism/armv7/Dockerfile b/docker/photoprism/armv7/Dockerfile
index d308a904c..b110943d0 100644
--- a/docker/photoprism/armv7/Dockerfile
+++ b/docker/photoprism/armv7/Dockerfile
@@ -1,5 +1,5 @@
 ##################################################### BUILD STAGE ######################################################
-FROM photoprism/development:armv7 as build
+FROM photoprism/develop:armv7 as build
 
 ARG TARGETARCH
 ARG TARGETPLATFORM
diff --git a/scripts/sql/mariadb-init.sql b/scripts/sql/mariadb-init.sql
index 3e089b47a..ea52ded54 100644
--- a/scripts/sql/mariadb-init.sql
+++ b/scripts/sql/mariadb-init.sql
@@ -298,7 +298,7 @@ CREATE TABLE `CLIENT` (
 
 LOCK TABLES `CLIENT` WRITE;
 /*!40000 ALTER TABLE `CLIENT` DISABLE KEYS */;
-INSERT INTO `CLIENT` VALUES ('4e4977d6-eaa9-4245-ae4c-04d20f5436d9','
','\0','account',0,'
',NULL,'/realms/master/account/','\0',NULL,'\0','master','openid-connect',0,'\0','\0','${client_account}','\0','client-secret','${authBaseUrl}',NULL,NULL,'
','\0','\0','\0'),('54905dd0-4ade-494e-9c35-ab2d445a99f5','
','\0','account-console',0,'
',NULL,'/realms/master/account/','\0',NULL,'\0','master','openid-connect',0,'\0','\0','${client_account-console}','\0','client-secret','${authBaseUrl}',NULL,NULL,'
','\0','\0','\0'),('5a059221-51fd-434f-84a6-40fa51cda5ce','
','
','photoprism-development',0,'\0','9d8351a0-ca01-4556-9c37-85eb634869b9',NULL,'\0','https://photoprism.traefik.net/','\0','master','openid-connect',-1,'\0','\0','PhotoPrism','\0','client-secret','https://photoprism.traefik.net/',NULL,NULL,'
','\0','
','\0'),('5b62e4f6-f646-4e0b-aa07-83a17a324137','
','\0','broker',0,'\0',NULL,NULL,'
',NULL,'\0','master','openid-connect',0,'\0','\0','${client_broker}','\0','client-secret',NULL,NULL,NULL,'
','\0','\0','\0'),('8a6bade2-ad19-45f1-9923-b357684d765c','
','\0','admin-cli',0,'
',NULL,NULL,'\0',NULL,'\0','master','openid-connect',0,'\0','\0','${client_admin-cli}','\0','client-secret',NULL,NULL,NULL,'\0','\0','
','\0'),('bda020f6-dd7f-4bb8-b565-bdc8edb9a8fc','
','\0','security-admin-console',0,'
',NULL,'/admin/master/console/','\0',NULL,'\0','master','openid-connect',0,'\0','\0','${client_security-admin-console}','\0','client-secret','${authAdminUrl}',NULL,NULL,'
','\0','\0','\0'),('e6b04c6f-e451-49ce-95b1-01b3325b77f7','
','\0','master-realm',0,'\0',NULL,NULL,'
',NULL,'\0','master',NULL,0,'\0','\0','master Realm','\0','client-secret',NULL,NULL,NULL,'
','\0','\0','\0');
+INSERT INTO `CLIENT` VALUES ('4e4977d6-eaa9-4245-ae4c-04d20f5436d9','
','\0','account',0,'
',NULL,'/realms/master/account/','\0',NULL,'\0','master','openid-connect',0,'\0','\0','${client_account}','\0','client-secret','${authBaseUrl}',NULL,NULL,'
','\0','\0','\0'),('54905dd0-4ade-494e-9c35-ab2d445a99f5','
','\0','account-console',0,'
',NULL,'/realms/master/account/','\0',NULL,'\0','master','openid-connect',0,'\0','\0','${client_account-console}','\0','client-secret','${authBaseUrl}',NULL,NULL,'
','\0','\0','\0'),('5a059221-51fd-434f-84a6-40fa51cda5ce','
','
','photoprism-develop',0,'\0','9d8351a0-ca01-4556-9c37-85eb634869b9',NULL,'\0','https://photoprism.traefik.net/','\0','master','openid-connect',-1,'\0','\0','PhotoPrism','\0','client-secret','https://photoprism.traefik.net/',NULL,NULL,'
','\0','
','\0'),('5b62e4f6-f646-4e0b-aa07-83a17a324137','
','\0','broker',0,'\0',NULL,NULL,'
',NULL,'\0','master','openid-connect',0,'\0','\0','${client_broker}','\0','client-secret',NULL,NULL,NULL,'
','\0','\0','\0'),('8a6bade2-ad19-45f1-9923-b357684d765c','
','\0','admin-cli',0,'
',NULL,NULL,'\0',NULL,'\0','master','openid-connect',0,'\0','\0','${client_admin-cli}','\0','client-secret',NULL,NULL,NULL,'\0','\0','
','\0'),('bda020f6-dd7f-4bb8-b565-bdc8edb9a8fc','
','\0','security-admin-console',0,'
',NULL,'/admin/master/console/','\0',NULL,'\0','master','openid-connect',0,'\0','\0','${client_security-admin-console}','\0','client-secret','${authAdminUrl}',NULL,NULL,'
','\0','\0','\0'),('e6b04c6f-e451-49ce-95b1-01b3325b77f7','
','\0','master-realm',0,'\0',NULL,NULL,'
',NULL,'\0','master',NULL,0,'\0','\0','master Realm','\0','client-secret',NULL,NULL,NULL,'
','\0','\0','\0');
 /*!40000 ALTER TABLE `CLIENT` ENABLE KEYS */;
 UNLOCK TABLES;