diff --git a/.dockerignore b/.dockerignore
index 6ddbe07b1..a27e848bc 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,34 +1,36 @@
 .dockerignore
 .DS_Store
 .git
 .eslintcache
 .vscode
 !.vscode/extensions.json
 
 node_modules
 
 landing/node_modules
 landing/dist
 
 lib/node_modules
 
 native
 !native/package.json
 !native/.flowconfig
 !native/ios/Podfile
 !native/ios/pod-patch
 !native/cpp/CommonCpp/grpc/protos
 
 web/node_modules
 web/dist
 
 keyserver/dist
+keyserver/node_modules
 keyserver/facts
 keyserver/secrets
-keyserver/node_modules
+keyserver/*.env
+keyserver/*.env.*
 
 services/tunnelbroker/Dockerfile
 services/identity/target
 services/identity/Dockerfile
 services/backup/Dockerfile
 services/blob/Dockerfile
diff --git a/.gitignore b/.gitignore
index e69f298ad..7b8f3d69f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,29 @@
 .DS_Store
+
 node_modules
+
 landing/node_modules
 landing/dist
+
 lib/node_modules
+
 native/cpp/CommonCpp/CryptoTools/opaque-ke-cxx/target
+
 web/node_modules
 web/dist
+
 keyserver/dist
 keyserver/node_modules
 keyserver/secrets
 keyserver/facts
+keyserver/*.env
+keyserver/*.env.*
+
 services/identity/target
+
 .eslintcache
 .vscode
 !.vscode/extensions.json
 
 # Nix
 result*