diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c28277e9..e606d495 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,19 +1,20 @@
 {
-  "name": "Default Linux Universal",
-  "image": "mcr.microsoft.com/devcontainers/universal:2-linux",
+  "name": "Ubuntu",
+  "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
   "features": {
-    "ghcr.io/devcontainers-contrib/features/pdm:2": {}
+    "ghcr.io/devcontainers-extra/features/pdm:2": {},
+    "ghcr.io/meaningful-ooo/devcontainer-features/fish:2": {}
   },
   "postCreateCommand": "pdm config venv.in_project true && pdm config venv.with_pip true && pdm sync && pdm run pre-commit install && pdm run compile && yarn install",
   "customizations": {
     "vscode": {
       "settings": {
         "python.analysis.diagnosticMode": "workspace",
-        "python.analysis.typeCheckingMode": "basic",
+        "python.analysis.typeCheckingMode": "standard",
         "[python]": {
           "editor.defaultFormatter": "ms-python.black-formatter",
           "editor.codeActionsOnSave": {
-            "source.organizeImports": true
+            "source.organizeImports": "explicit"
           }
         },
         "[javascript]": {
diff --git a/pyproject.toml b/pyproject.toml
index 871992d5..fabb8658 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -67,6 +67,7 @@ custom-hook = "pdm_build.py"
 run-setuptools = false
 
 [tool.pyright]
+typeCheckingMode = "standard"
 pythonPlatform = "All"
 reportPrivateImportUsage = false
 reportShadowedImports = false