diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..79c150fd
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,28 @@
+admin/admin
+backend/backend
+dashboard/dashboard
+evdist/evdist
+frontend/frontend
+repochecker/repochecker
+frontend/ui/node_modules
+fickit-backend-initrd.img
+fickit-backend-kernel
+fickit-backend-squashfs.img
+fickit-backend-state
+fickit-frontend-initrd.img
+fickit-frontend-kernel
+fickit-frontend-squashfs.img
+fickit-frontend-state
+fickit-prepare-initrd.img
+fickit-prepare-kernel
+fickit-update-initrd.img
+fickit-update-kernel
+DASHBOARD
+FILES
+PKI
+REMOTE
+SETTINGS
+SETTINGSDIST
+submissions
+TEAMS
+vendor
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 13d0d877..e3798e7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ vendor/
 DASHBOARD/
 FILES/
 PKI/
+REMOTE/
 SETTINGS/
 SETTINGSDIST/
 TEAMS/
@@ -29,4 +30,5 @@ fickit-update-cmdline
 fickit-update-initrd.img
 fickit-update-kernel
 fickit-update-squashfs.img
-started
\ No newline at end of file
+result
+started