diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4d0cfbfd7693ade41e7bd19bf824775f991a0bc8..a3e9fbdb946305a010b97042dba4239dabc52418 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -30,23 +30,13 @@ repos:
         name: Hadolint Dockerfile linter
         description: Dockerfile linter, validate inline bash, written in Haskell
         minimum_pre_commit_version: '0.18.0'
-        language: docker
-        entry: hadolint
-        files: Dockerfile
-      - id: docker-compose
-        name: docker-compose config
-        description: Validate the Docker Compose file using docker-compose config
-        minimum_pre_commit_version: '0.18.0'
-        language: docker
-        entry: docker-compose-config
-        files: docker-compose
-        types: [ yaml ]
+        language: docker_image
+        entry: adarnimrod/docker-pre-commit hadolint
+        types: [dockerfile]
       - id: dockerfile-lint
         name: dockerfile-lint
         description: A rule based 'linter' for Dockerfiles
         minimum_pre_commit_version: '0.18.0'
         language: docker_image
-        entry: projectatomic/dockerfile-lint dockerfile_lint
-        args: [ '-f' ]
-        types: [ dockerfile ]
-        require_serial: true
+        entry: adarnimrod/docker-pre-commit dockerfile-lint
+        types: [dockerfile]
diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml
index 11901f1c702a36149c12e0e5dc005d61c7971fbf..2c8ec300d89f30f070dce707f7c841708075d5dd 100644
--- a/.pre-commit-hooks.yaml
+++ b/.pre-commit-hooks.yaml
@@ -6,14 +6,14 @@
   minimum_pre_commit_version: '0.18.0'
   language: docker_image
   entry: adarnimrod/docker-pre-commit hadolint
-  types: [ dockerfile ]
+  types: [dockerfile]
 - id: dockerfile-lint
   name: dockerfile-lint
   description: A rule based 'linter' for Dockerfiles
   minimum_pre_commit_version: '0.18.0'
   language: docker_image
   entry: adarnimrod/docker-pre-commit dockerfile-lint
-  types: [ dockerfile ]
+  types: [dockerfile]
 - id: docker-compose
   name: docker-compose config
   description: Validate the Docker Compose file using docker-compose config
@@ -21,4 +21,4 @@
   language: docker_image
   entry: adarnimrod/docker-pre-commit docker-compose-config
   files: docker-compose
-  types: [ yaml ]
+  types: [yaml]
diff --git a/Dockerfile b/Dockerfile
index 184231a7ff36009a27cca8fdf91720f1663cdcc4..be7b5d13d594f5e5418b15b45e3992124e059546 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
 FROM alpine:3.10
+# hadolint ignore=DL3016,DL3018
 RUN apk add --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \
         docker-compose \
         npm \
@@ -16,3 +17,5 @@ RUN apk add --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpin
     hadolint --version
 COPY docker-compose-config dockerfile-lint /usr/local/bin/
 USER nobody
+LABEL Name docker-pre-commit
+LABEL Version 0.3.0