diff --git a/.dockerignore b/.dockerignore
index 9b775f1..ddad3d9 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,2 @@
 .*
-
-!.eslintrc.json
-!.prettierrc.json
-
-coverage
-node_modules
+*
diff --git a/.editorconfig b/.editorconfig
index 0f17867..39abb03 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,3 +7,7 @@ indent_size = 2
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[Makefile]
+indent_size = 4
+indent_style = tab
diff --git a/__tests__/Dockerfile b/Dockerfile
similarity index 91%
rename from __tests__/Dockerfile
rename to Dockerfile
index 67d08d7..37f6317 100644
--- a/__tests__/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM node:12-slim
+ARG NODE_VERSION
+
+FROM node:${NODE_VERSION}-buster-slim
 
 SHELL ["/bin/bash", "-l", "-c"]
 
diff --git a/Makefile b/Makefile
index 3c3d765..473b2e9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 cmd := "bash"
 msg := ""
 IMAGE_NAME := actions_hugo_dev:latest
-DOCKER_BUILD := docker build . -t $(IMAGE_NAME) --file ./__tests__/Dockerfile
+NODE_VERSION := $(shell cat ./.nvmrc)
+DOCKER_BUILD := docker build . -t $(IMAGE_NAME) --build-arg NODE_VERSION=$(NODE_VERSION)
 DOCKER_RUN := docker run --rm -i -t -v ${PWD}:/repo -v ~/.gitconfig:/etc/gitconfig $(IMAGE_NAME)