diff --git a/Dockerfile b/Dockerfile
index 96322966..5eb466e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -73,9 +73,6 @@ RUN sed -i 's/#imap_idle_notify_interval = 2 mins/imap_idle_notify_interval = 29
 COPY target/dovecot/auth-passwdfile.inc /etc/dovecot/conf.d/
 COPY target/dovecot/??-*.conf /etc/dovecot/conf.d/
 RUN cd /usr/share/dovecot && ./mkcert.sh
-# See https://dovecot.org/list/dovecot/2014-March/095194.html
-RUN mkdir /usr/lib/dovecot/modules/sieve/
-RUN ln -s /usr/lib/dovecot/modules/lib90_sieve_extprograms_plugin.so /usr/lib/dovecot/modules/sieve
 RUN mkdir /usr/lib/dovecot/sieve-pipe && chmod 755 /usr/lib/dovecot/sieve-pipe
 RUN mkdir /usr/lib/dovecot/sieve-filter && chmod 755 /usr/lib/dovecot/sieve-filter
 
diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh
index 8f7f04b5..b4b9c3d9 100644
--- a/target/start-mailserver.sh
+++ b/target/start-mailserver.sh
@@ -490,12 +490,14 @@ function _setup_dovecot() {
 	rm -f /usr/lib/dovecot/sieve-pipe/*
 	if [ -d /tmp/docker-mailserver/sieve-filter ]; then
 		cp /tmp/docker-mailserver/sieve-filter/* /usr/lib/dovecot/sieve-filter/
-		chmod 511 /usr/lib/dovecot/sieve-filter/*
-  fi
+		chown docker:docker /usr/lib/dovecot/sieve-filter/*
+		chmod 550 /usr/lib/dovecot/sieve-filter/*
+	fi
 	if [ -d /tmp/docker-mailserver/sieve-pipe ]; then
 		cp /tmp/docker-mailserver/sieve-pipe/* /usr/lib/dovecot/sieve-pipe/
-		chmod 511 /usr/lib/dovecot/sieve-pipe/*
-  fi
+		chown docker:docker /usr/lib/dovecot/sieve-pipe/*
+		chmod 550 /usr/lib/dovecot/sieve-pipe/*
+	fi
 }
 
 function _setup_dovecot_local_user() {
diff --git a/test/tests.bats b/test/tests.bats
index afeb14a9..3114ca2d 100644
--- a/test/tests.bats
+++ b/test/tests.bats
@@ -271,7 +271,7 @@ load 'test_helper/bats-assert/load'
 @test "checking smtp: delivers mail to existing account" {
   run docker exec mail /bin/sh -c "grep 'postfix/lmtp' /var/log/mail/mail.log | grep 'status=sent' | grep ' Saved)' | wc -l"
   assert_success
-  assert_output 8
+  assert_output 9
 }
 
 @test "checking smtp: delivers mail to existing alias" {