diff --git a/.dockerignore b/.dockerignore
--- a/.dockerignore
+++ b/.dockerignore
@@ -23,9 +23,11 @@
 web/dist
 
 keyserver/dist
+keyserver/node_modules
 keyserver/facts
 keyserver/secrets
-keyserver/node_modules
+keyserver/*.env
+keyserver/*.env.*
 
 services/tunnelbroker/Dockerfile
 services/identity/target
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,26 @@
 .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