diff --git a/Dockerfile b/Dockerfile
index 275ffb12..41ea9fc3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,6 +35,13 @@ RUN apk --update --no-cache add \
       PyGithub==1.55 && \
     git config --global advice.detachedHead false
 
+# Install pre-commit support
+RUN pip install pre-commit
+# Install ADR tools
+RUN cd /usr/local/bin && curl -fsSL https://github.com/npryce/adr-tools/archive/refs/tags/3.0.0.tar.gz | \
+    tar xzf - adr-tools-3.0.0/src --strip 2
+
+
 ### Workaround https://github.com/pypa/pip/issues/5247
 # Should no longer be needed, but leaving it in case we need to revert
 #RUN pip3 install --upgrade --force-reinstall pip==9.0.3 && \
@@ -54,6 +61,7 @@ RUN apk --update --no-cache add \
       helm@cloudposse \
       helmfile@cloudposse \
       codefresh@cloudposse \
+      npm nodejs \
       terraform-0.11@cloudposse terraform-0.12@cloudposse \
       terraform-0.13@cloudposse terraform-0.14@cloudposse \
       terraform-0.15@cloudposse terraform-1@cloudposse \
diff --git a/templates/.github/workflows/validate-codeowners.yml b/templates/.github/workflows/validate-codeowners.yml
index 70f829e3..4b4a2264 100644
--- a/templates/.github/workflows/validate-codeowners.yml
+++ b/templates/.github/workflows/validate-codeowners.yml
@@ -10,6 +10,7 @@ jobs:
     steps:
     - name: "Checkout source code at current commit"
       uses: actions/checkout@v2
+      # Leave pinned at 0.7.1 until https://github.com/mszostok/codeowners-validator/issues/173 is resolved
     - uses: mszostok/codeowners-validator@v0.7.1
       if: github.event.pull_request.head.repo.full_name == github.repository
       name: "Full check of CODEOWNERS"