diff --git a/.config/nvim/.github/README.md b/.config/nvim/.github/README.md
index ef8d25ab..ada28db3 100644
--- a/.config/nvim/.github/README.md
+++ b/.config/nvim/.github/README.md
@@ -384,6 +384,13 @@
 
 </details>
 
+<details>
+<summary><b>🏠 Remote-development</b>></summary>
+
+- [esensar/nvim-dev-container](https://dotfyle.com/plugins/esensar/nvim-dev-container)
+
+</details>
+
 <details>
 <summary><b>📜 Scrollbar-Scrolling</b></summary>
 
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 5f719ed9..624b224d 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -78,6 +78,7 @@
   "nvim-dap-python": { "branch": "master", "commit": "091e4ae00a12085f9ed4200a3cd04af7179b8a23" },
   "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" },
+  "nvim-dev-container": { "branch": "main", "commit": "47927e2df27503debf3bfbfe90afefbac73e002f" },
   "nvim-devdocs": { "branch": "master", "commit": "521d24661ffe6d1ba025debea2675c765a9c1ee1" },
   "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
   "nvim-lint": { "branch": "master", "commit": "8df53b5dde8ea80f0a039775777eae6648a10229" },
diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index 810894d9..024b3a09 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -24,6 +24,7 @@
     "plugins.extras.dap.persistent-breakpoints",
     "plugins.extras.editor.color",
     "plugins.extras.editor.compiler",
+    "plugins.extras.editor.dev-container",
     "plugins.extras.editor.docs.devdocs",
     "plugins.extras.editor.fold",
     "plugins.extras.editor.git.diffview",
diff --git a/.config/nvim/lua/plugins/extras/editor/dev-container.lua b/.config/nvim/lua/plugins/extras/editor/dev-container.lua
new file mode 100644
index 00000000..fa41ed2d
--- /dev/null
+++ b/.config/nvim/lua/plugins/extras/editor/dev-container.lua
@@ -0,0 +1,32 @@
+return {
+  {
+    "https://codeberg.org/esensar/nvim-dev-container",
+    cmd = {
+      "DevcontainerStart",
+      "DevcontainerStop",
+      "DevcontainerLogs",
+      "DevcontainerEditNearestConfig",
+      "DevcontainerAttach",
+      "DevcontainerExec",
+      "DevcontainerStopAll",
+      "DevcontainerRemoveAll",
+    },
+    dependencies = { "nvim-treesitter/nvim-treesitter" },
+    opts = {},
+    keys = {
+      { "<leader>os", "<cmd>DevcontainerStart<cr>", desc = "Start" },
+      { "<leader>oS", "<cmd>DevcontainerStop<cr>", desc = "Stop" },
+      { "<leader>ol", "<cmd>DevcontainerLogs<cr>", desc = "Log" },
+      { "<leader>oc", "<cmd>DevcontainerEditNearestConfig<cr>", desc = "Config" },
+      { "<leader>oa", "<cmd>DevcontainerAttach<cr>", desc = "Attach" },
+    },
+  },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      defaults = {
+        ["<leader>o"] = { name = " c[o]ntainers" },
+      },
+    },
+  },
+}