diff --git a/Dockerfile b/.devcontainer/Dockerfile
similarity index 66%
rename from Dockerfile
rename to .devcontainer/Dockerfile
index 3023875..f099734 100644
--- a/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/ignition-devs/devcontainer-base:python as devcontainer
+FROM quay.io/ignition-devs/devcontainer-base:python
 
 COPY requirements.txt /tmp/requirements.txt
 
@@ -8,4 +8,4 @@ RUN set -eux; \
     python2 -m pip install --requirement \
         /tmp/requirements.txt
 
-CMD ["/bin/bash"]
+CMD ["/bin/bash"]
\ No newline at end of file
diff --git a/.devcontainer.json b/.devcontainer/devcontainer.json
similarity index 94%
rename from .devcontainer.json
rename to .devcontainer/devcontainer.json
index bf575dc..2242561 100644
--- a/.devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,7 @@
 {
   "name": "ignition-api-8.1",
   "build": {
+    "context": "..",
     "dockerfile": "Dockerfile"
   },
   "customizations": {
@@ -15,4 +16,4 @@
     }
   },
   "onCreateCommand": "pre-commit install && pre-commit install --hook-type commit-msg"
-}
+}
\ No newline at end of file
diff --git a/.editorconfig b/.editorconfig
index bfe4581..048467a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,15 +5,16 @@ root = true
 
 [*]
 end_of_line = lf
-insert_final_newline = true
 trim_trailing_whitespace = true
 
-[{*.md,*.yaml,*.yml}]
+[*.{md,toml,yaml,yml}]
 indent_style = space
 indent_size = 2
+insert_final_newline = true
 x-soft-wrap-text = true
 
-[*.py]
+[*.{ini,py}]
 charset = utf-8
 indent_style = space
+insert_final_newline = true
 indent_size = 4