diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c6644d40..1624e5be 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -6,9 +6,7 @@ ARG PIP_DEFAULT_TIMEOUT=100 \
     PYTHONFAULTHANDLER=1 \
     PYTHONHASHSEED=random \
     PYTHONUNBUFFERED=1 \
-    DEBIAN_FRONTEND=noninteractive \
-    \
-    POETRY_VERSION=1.8.2
+    DEBIAN_FRONTEND=noninteractive
 
 ENV TZ=Asia/Tokyo
 
@@ -59,6 +57,6 @@ RUN set -eux && \
 USER vscode
 ENV PATH $PATH:/home/vscode/.local/bin
 RUN set -eux && \
-    pip install --user "poetry==${POETRY_VERSION}" && \
+    pip install --user "poetry==$(grep -oP '(?<=poetry\s).+' .tool-versions)" && \
     pip install --user poetry-dynamic-versioning && \
     type poetry
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d25a2c36..fdd84f46 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -49,5 +49,6 @@
     }
   },
   // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-  "remoteUser": "vscode"
+  "remoteUser": "vscode",
+  "updateRemoteUserUID": true
 }