diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c2b8b8c2217cdb76e085aa2317dbe8f7ba6e4c9..392840e56a20ff75793d4b69f9715bdacfd4af18 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,9 @@ lint:dockerfile:
     - mkdir ~/.config
     - cp ./.hadolint.yaml ~/.config/hadolint.yaml
   script:
-    - find . -name "Dockerfile" -execdir hadolint {} \;
+    - |
+      set -eo pipefail
+      find . -name "Dockerfile" -execdir hadolint {} \;
 
 lint:shell-script:
   stage: test
@@ -25,7 +27,9 @@ lint:shell-script:
   before_script:
     - shellcheck -V
   script:
-    - find . -name "*.sh" -exec shellcheck {} \;
+    - |
+      set -eo pipefail
+      find . -name "*.sh" -exec shellcheck {} \;
 
 #
 # IMAGE BUILDS/PUSHES
diff --git a/.hadolint.yaml b/.hadolint.yaml
index 5bc0e7f57745ede322dc76ffb4e1077335f06d97..f6e0d04508e413c9c2c3c4fb1b601161523e7737 100644
--- a/.hadolint.yaml
+++ b/.hadolint.yaml
@@ -1,3 +1,3 @@
 ignored:
   - DL3008
-  - DL3013
+#  - DL3013