diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 713a436b2bab7ce59d84134e0e10f42999421257..04e20dc648ce6696690ff779d4a90175168e21d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,6 @@
 include:
+  - project: emfollow/gitlab-ci-templates
+    file: lint.yml
   - project: emfollow/gitlab-ci-templates
     file: sccb.yml
 
@@ -39,14 +41,11 @@ test:
 
 # Run code lint
 lint:
-  image: python:3.6
   stage: test
   variables:
     GIT_STRATEGY: none
-  script:
+  before_script:
     - tar --strip-components 1 -xf *.tar.*
-    - pip install flake8
-    - flake8 --show-source .
   dependencies:
     - build