diff --git a/.gitignore b/.gitignore
index 0dec07e4..7dfead0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,7 @@ Thumbs.db
 .DS_Store
 .vscode/*
 !.vscode/extensions.json
+!.vscode/settings.json
 pyinstrument/
 
 # Now managed by templates
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..9009f569
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,16 @@
+{
+    "editor.formatOnSave": true,
+    "python.formatting.provider": "black",
+    "python.linting.enabled": true,
+    "python.linting.flake8Enabled": true,
+    "python.linting.mypyEnabled": true,
+    "python.testing.pytestEnabled": true,
+    "python.analysis.diagnosticMode": "workspace",
+    "files.associations": {
+        "requirements-*.txt": "pip-requirements"
+    },
+    "sonarlint.connectedMode.project": {
+        "connectionId": "jellyfin",
+        "projectKey": "jellyfin_jellyfin-kodi"
+    },
+}