diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40040d5371c9bee4d3bcdd6d0a5ca5aba642decd..aa71c5b3442f02b5e6d6dba6c554bb1af678cd19 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,12 @@ lint-dockerfile:
   script:
     - find . -name "Dockerfile" -execdir hadolint {} \;
 
+lint-shell-script:
+  stage: test
+  image: shellcheck:latest
+  script:
+    - find . -name "*.sh" -execdir shellcheck {} \;
+
 #
 # IMAGE BUILDS/PUSHES
 #
@@ -59,15 +65,6 @@ build-debian-jessie-build-dev:
   except:
     - master
 
-lint-debian-jessie-build-script:
-  stage: test
-  image: debian:latest
-  before_script:
-    - apt-get update
-    - apt-get install -y shellcheck
-  script:
-    - shellcheck ./debian/jessie/setup.sh
-
 # PHP 7.3
 build-php-7.3-master:
   stage: deploy