diff --git a/.dockerignore b/.dockerignore
index 372b05bf..751289de 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,9 +1,11 @@
+# build folders and similar which are not needed for the docker build
 ui/node_modules
-server/target/debug
-!server/target/debug/lemmy_server
-server/target/release
-server/target/debug/incremental
-ui/dist
 server/target
 docker/dev/volumes
+docker/federation-test/volumes
 .git
+ansible
+
+# exceptions, needed for federation-test build
+
+!server/target/debug/lemmy_server
diff --git a/.gitignore b/.gitignore
index 7d60afd6..919358cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,17 @@
+# local ansible configuration
 ansible/inventory
 ansible/inventory_dev
 ansible/passwords/
+
+# docker build files
 docker/lemmy_mine.hjson
 docker/dev/env_deploy.sh
 docker/federation-test/volumes
+docker/dev/volumes
+
+# local build files
 build/
-.idea/
 ui/src/translations
-docker/dev/volumes
\ No newline at end of file
+
+# ide config
+.idea/
\ No newline at end of file
diff --git a/ui/.gitignore b/ui/.gitignore
index cc0ab540..bdd11a35 100644
--- a/ui/.gitignore
+++ b/ui/.gitignore
@@ -6,14 +6,11 @@ _site
 .git
 build
 .build
-.git
-.history
 .idea
 .jshintrc
 .nyc_output
 .sass-cache
 .vscode
-build
 coverage
 jsconfig.json
 Gemfile.lock