diff --git a/server/.gitignore b/.gitignore
similarity index 64%
rename from server/.gitignore
rename to .gitignore
index 4b56acfb..c1d7f412 100644
--- a/server/.gitignore
+++ b/.gitignore
@@ -1,3 +1,35 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+*storybook.log
+
+# TypeDoc
+docs
+
+# ------------------------------------------------------------------------------------------
+
 # compiled output
 /dist
 /node_modules
diff --git a/client/.gitignore b/client/.gitignore
deleted file mode 100644
index 49cd043d..00000000
--- a/client/.gitignore
+++ /dev/null
@@ -1,29 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-
-*storybook.log
-
-# TypeDoc
-docs
\ No newline at end of file