diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 16158c4db..9c9692477 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,6 +27,22 @@ jobs:
     - name: "Check out NIPAP repository"
       uses: actions/checkout@v2
 
+    - name: "Hadolint nipapd"
+      uses: hadolint/hadolint-action@v3.1.0
+      with:
+        Dockerfile: Dockerfile.nipapd
+        override-info:
+          - DL3008
+          - DL4000
+
+    - name: "Hadolint WWW"
+      uses: hadolint/hadolint-action@v3.1.0
+      with:
+        Dockerfile: Dockerfile.www
+        override-info:
+          - DL3008
+          - DL4000
+
     - name: "Install dependencies and prepare NIPAP"
       run: |
         # Set up NIPAP repo