diff --git a/docker-compose.yml b/docker-compose.yml
index 275b5cc..8cb51c2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -446,6 +446,7 @@ services:
     environment:
      - FQDN=${FQDN}
      - allow_client_guests=yes
+     - allow_dynamic_client_registration=yes
     env_file:
      - kopano_konnect.env
     networks:
diff --git a/konnect/Dockerfile b/konnect/Dockerfile
index 217254b..d484d52 100644
--- a/konnect/Dockerfile
+++ b/konnect/Dockerfile
@@ -1,4 +1,4 @@
-ARG CODE_VERSION=0.20.0
+ARG CODE_VERSION=0.21.0
 FROM kopano/konnectd:${CODE_VERSION}
 ARG CODE_VERSION
 ENV CODE_VERSION="${CODE_VERSION}"
diff --git a/konnect/wrapper.sh b/konnect/wrapper.sh
index 7db3348..323386a 100755
--- a/konnect/wrapper.sh
+++ b/konnect/wrapper.sh
@@ -21,6 +21,11 @@ if [ "$allow_client_guests" = "yes" ]; then
 	set -- "$@" "--allow-client-guests"
 fi
 
+# shellcheck disable=SC2154
+if [ "$allow_dynamic_client_registration" = "yes" ]; then
+	set -- "$@" "--allow-dynamic-client-registration"
+fi
+
 dockerize \
 	-wait file:///kopano/ssl/konnectd-tokens-signing-key.pem \
 	-wait file:///kopano/ssl/konnectd-encryption.key \