diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cfdee1f4fdd7a50ca45da03b7211ce2591bb9252..311b582290277864429fe962068725cf7e60d3ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,26 @@
-# Specify docker image
-image: debian:stretch
+stages:
+  - lint
+  - codestyle
 
-# Generate perlcritic rapport
-create_perlcritic_rapport:
+# Perl lint
+create_perl_lint_rapport:
+  image: registry.fusiondirectory.org/fusiondirectory/fd/perlcodestyle:stretch
+  stage: lint
   only:
     - branches
-    - tags
-  before_script:
-    - apt-get update -qq
-    - apt-get install -y -qq libperl-critic-perl
   script:
-    - perlcritic .
+    - perl -cW bin/ldap-schema-manager
+    - perl -cW bin/schema2ldif
 
-# Perl lint
-create_perl_lint_rapport:
+# Generate perlcritic rapport
+create_perlcritic_rapport:
+  image: registry.fusiondirectory.org/fusiondirectory/fd/perlcodestyle:stretch
+  stage: codestyle
   only:
     - branches
-    - tags
-  before_script:
-    - apt-get update -qq
-    - apt-get install -y -qq perl
   script:
-    - find bin/ -type f -print0 | xargs -0 -n1 perl -cw
+    - cp bin/ldap-schema-manager bin/ldap-schema-manager.pl
+    - cp bin/schema2ldif bin/bin/schema2ldif.pl
+    - perlcritic --quiet --verbose "%f~|~%s~|~%l~|~%c~|~%m~|~%e~|~%p~||~%n" bin
+
+