diff --git a/.dockerignore b/.dockerignore
index 781176e0..65e3ba2e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1 @@
-test/onedir
\ No newline at end of file
+test/
diff --git a/.gitignore b/.gitignore
index 9a96a794..75d788ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,15 @@ test/config/postfix-accounts.cf
 test/config/letsencrypt/mail.my-domain.com/combined.pem
 test/onedir
 config/opendkim/
+test/config/dovecot-lmtp/userdb
+test/config/key*
+test/config/opendkim/keys/domain.tld/
+test/config/opendkim/keys/example.com/
+test/config/opendkim/keys/localdomain2.com/
+test/config/postfix-aliases.cf
+test/config/postfix-receive-access.cf
+test/config/postfix-receive-access.cfe
+test/config/postfix-send-access.cf
+test/config/postfix-send-access.cfe
+test/config/relay-hosts/chksum
+test/config/relay-hosts/postfix-aliases.cf
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 484f0afa..44762f77 100644
--- a/Makefile
+++ b/Makefile
@@ -329,7 +329,4 @@ clean:
 		sudo rm -rf test/config ;\
 		mv testconfig.bak test/config ;\
 	fi
-	-sudo rm -rf test/onedir
-	-sudo rm -rf test/alias
-	-sudo rm -rf test/relay
-
+	-sudo rm -rf test/onedir test/alias test/relay test/config/dovecot-lmtp/userdb test/config/key* test/config/opendkim/keys/domain.tld/ test/config/opendkim/keys/example.com/ test/config/opendkim/keys/localdomain2.com/ test/config/postfix-aliases.cf test/config/postfix-receive-access.cf test/config/postfix-receive-access.cfe test/config/postfix-send-access.cf test/config/postfix-send-access.cfe test/config/relay-hosts/chksum test/config/relay-hosts/postfix-aliases.cf
\ No newline at end of file