diff --git a/Dockerfile b/Dockerfile
index 3cd2563a2..d444461bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM photoprism/development:20210205
+FROM photoprism/development:20210214
 
 # Set up project directory
 WORKDIR "/go/src/github.com/photoprism/photoprism"
diff --git a/Makefile b/Makefile
index 251171b4f..045535b37 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,9 @@ export GO111MODULE=on
 
 GOIMPORTS=goimports
 BINARY_NAME=photoprism
-DOCKER_TAG=`date -u +%Y%m%d`
-UID=`(id -u)`
 
+DOCKER_TAG := $(shell date -u +%Y%m%d)
+UID := $(shell id -u)
 HASRICHGO := $(shell which richgo)
 
 ifdef HASRICHGO
diff --git a/docker/photoprism/Dockerfile b/docker/photoprism/Dockerfile
index 1630aabfe..c32481959 100644
--- a/docker/photoprism/Dockerfile
+++ b/docker/photoprism/Dockerfile
@@ -1,4 +1,4 @@
-FROM photoprism/development:20210205 as build
+FROM photoprism/development:20210214 as build
 
 # Set up project directory
 WORKDIR "/go/src/github.com/photoprism/photoprism"