diff --git a/.gitignore b/.gitignore
index 35a41d63930800b9e8d508bdc4251ef2e881f3db..892b5f00c80bb5552fb41b42e67d90dabf7bdc7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,13 +12,6 @@ target/
 *.iws
 *.iml
 *.ipr
-.vscode
-
-# Client
-alfa-client/.vscode/
-alfa-client/apps/coverage/
-alfa-client/node/*
-alfa-client/temp/*
 
 .attach**
 .factorypath
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..966f07033182549f7aa60700c9930e4bce2acd01
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "angular.enable-strict-mode-prompt": false
+}
\ No newline at end of file
diff --git a/alfa-client/.gitignore b/alfa-client/.gitignore
index 075614c3930ad5fdc64fe005bcae36052b6d0954..6116ea3d904921685f791527ee0ec33f12136fa8 100644
--- a/alfa-client/.gitignore
+++ b/alfa-client/.gitignore
@@ -28,12 +28,13 @@ test-report.xml
 # IDE - VSCode
 .vscode/*
 !.vscode/user-settings.json
+!.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
 
 # misc
-/.angular/cache
+/.angular
 /.sass-cache
 /connect.lock
 /coverage
@@ -42,10 +43,9 @@ npm-debug.log
 yarn-error.log
 testem.log
 /typings
+/.nx
 
 # System Files
 .DS_Store
 Thumbs.db
 
-.angular
-.nx
diff --git a/alfa-client/.vscode/settings.json b/alfa-client/.vscode/settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..faa52d3354b8a11143a335b6092b77e99c95bc18
--- /dev/null
+++ b/alfa-client/.vscode/settings.json
@@ -0,0 +1,14 @@
+{
+  "angular.enable-strict-mode-prompt": false,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.detectIndentation": false,
+  "editor.formatOnSave": true,
+  "editor.formatOnPaste": true,
+  "editor.formatOnType": true,
+  "editor.insertSpaces": true,
+  "editor.tabSize": 2,
+  "files.encoding": "utf8",
+  "files.eol": "\n",
+  "files.trimTrailingWhitespace": true,
+  "prettier.useTabs": false
+}