diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index eb2fb5039b7..43fe1bfebb3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -207,6 +207,9 @@ jobs:
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
+      - name: Register hadolint problem matcher
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/hadolint.json"
       - name: Check Dockerfile
         uses: docker://hadolint/hadolint:v1.18.0
         with:
diff --git a/.github/workflows/matchers/hadolint.json b/.github/workflows/matchers/hadolint.json
new file mode 100644
index 00000000000..5a2f1846c77
--- /dev/null
+++ b/.github/workflows/matchers/hadolint.json
@@ -0,0 +1,16 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "hadolint",
+      "pattern": [
+        {
+          "regexp": "^(.+):(\\d+)\\s+((DL\\d{4}).+)$",
+          "file": 1,
+          "line": 2,
+          "message": 3,
+          "code": 4
+        }
+      ]
+    }
+  ]
+}