diff --git a/README.md b/README.md
index 4c977ebcb904884bd8083a93728dc464e4365bdd..e5497926e7d3e40b46b89f5a923363fb360bde66 100644
--- a/README.md
+++ b/README.md
@@ -239,20 +239,6 @@ Here are some advices about your **secrets** (variables marked with a :lock:):
 
 ## Jobs
 
-### `docker-lint` job
-
-This job performs a [Lint](https://github.com/projectatomic/dockerfile_lint) on your `Dockerfile`.
-
-It is bound to the `build` stage, and uses the following variables:
-
-| Name                  | Description                            | Default value                           |
-| --------------------- | -------------------------------------- | --------------------------------------- |
-| `DOCKER_LINT_ENABLED` | Set to `true` to enable dockerlint | _(none: disabled by default)_ |
-| `DOCKER_LINT_IMAGE`   | The dockerlint image                   | `registry.hub.docker.com/projectatomic/dockerfile-lint:latest`  |
-| `DOCKER_LINT_ARGS`    | Additional `dockerfile_lint` arguments | _(none)_                                |
-
-In case you have to disable some rules, copy and edit the [rules](https://github.com/projectatomic/dockerfile_lint#extending-and-customizing-rule-files) into `mycustomdockerlint.yml` and set `DOCKER_LINT_ARGS: '-r mycustomdockerlint.yml'`
-
 ### `docker-hadolint` job
 
 This job performs a [Lint](https://github.com/hadolint/hadolint) on your `Dockerfile`.
diff --git a/kicker.json b/kicker.json
index 490d4100e2bb4eaaf7728e59b85394792511a91a..6f7ef0e8e8a31550ea107493a40f2aaf3cb6c28a 100644
--- a/kicker.json
+++ b/kicker.json
@@ -116,24 +116,6 @@
     }
   ],
   "features": [
-    {
-      "id": "lint",
-      "name": "dockerfile-lint",
-      "description": "This job performs a [Lint](https://github.com/projectatomic/dockerfile_lint) on your `Dockerfile`.",
-      "enable_with": "DOCKER_LINT_ENABLED",
-      "variables": [
-        {
-          "name": "DOCKER_LINT_IMAGE",
-          "description": "The docker image to lint your Dockerfile",
-          "default": "registry.hub.docker.com/projectatomic/dockerfile-lint:latest"
-        },
-        {
-          "name": "DOCKER_LINT_ARGS",
-          "description": "Additional `dockerfile_lint` arguments",
-          "advanced": true
-        }
-      ]
-    },
     {
       "id": "hadolint",
       "name": "Hadolint",
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index c096e3149901c123456bcededd263a411b8ce663..69a855d393f7447be8568ec1b9e47a42deb8fc0a 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -59,7 +59,6 @@ variables:
   # variabilized tracking image
   TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"
 
-  DOCKER_LINT_IMAGE: "registry.hub.docker.com/projectatomic/dockerfile-lint:latest"
   DOCKER_HADOLINT_IMAGE: "registry.hub.docker.com/hadolint/hadolint:latest-alpine"
   DOCKER_IMAGE: "registry.hub.docker.com/library/docker:latest"
   DOCKER_DIND_IMAGE: "registry.hub.docker.com/library/docker:dind"
@@ -531,19 +530,6 @@ stages:
 # ==================================================
 # Stage: build
 # ==================================================
-# lint-job is used to check the syntax of the Dockerfile for best practices.
-docker-lint:
-  image: "$DOCKER_LINT_IMAGE"
-  extends: .docker-base
-  stage: build
-  dependencies: []
-  script:
-    - dockerfile_lint -f $DOCKER_FILE $DOCKER_LINT_ARGS
-  rules:
-    # disable if DOCKER_LINT_ENABLED not set
-    - if: '$DOCKER_LINT_ENABLED != "true"'
-      when: never
-    - !reference [.test-policy, rules]
 
 docker-hadolint:
   image: