diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 60f7b617d9ff6f05c2edf3a35e7b13296cd37cf2..d84c347f6c5371edc2cb40f057a07ad353bb6ef1 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -105,18 +105,21 @@ python_syntax:
 
 ##########################################################
 ## Check for errors in bash/sh scripts
-## Uses https://github.com/cytopia/awesome-ci
+## Uses https://github.com/koalaman/shellcheck
 ##########################################################
 bash_syntax:
+  before_script:
+    - apk add --update shellcheck
   stage: postcheck
   script:
     - RET=0
-    - docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-sh --path=/ac --extension=sh --ignore=.ci_config || RET=1
-    - docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-bash --path=/ac --extension=bash --ignore=.ci_config || RET=1
+    - find . -type f -name '*.sh' -exec shellcheck -s sh {} + || RET=1
+    - find . -type f -name '*.bash' -exec shellcheck -s bash {} + || RET=1
     - exit $RET
   when: always
   tags:
     - docker
+  allow_failure: yes
 
 ##########################################################
 ## Check for errors in markdown files
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index dd3b5b2e6e82f5cc629c9728cd14918e482532af..02a669a89e0d47f9497b4be125604513e9059345 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -107,18 +107,21 @@ python_syntax:
 
 ##########################################################
 ## Check for errors in bash/sh scripts
-## Uses https://github.com/cytopia/awesome-ci
+## Uses https://github.com/koalaman/shellcheck
 ##########################################################
 bash_syntax:
+  before_script:
+    - apk add --update shellcheck
   stage: postcheck
   script:
     - RET=0
-    - docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-sh --path=/ac --extension=sh --ignore=.ci_config || RET=1
-    - docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-bash --path=/ac --extension=bash --ignore=.ci_config || RET=1
+    - find . -type f -name '*.sh' -exec shellcheck -s sh {} + || RET=1
+    - find . -type f -name '*.bash' -exec shellcheck -s bash {} + || RET=1
     - exit $RET
   when: always
   tags:
     - docker
+  allow_failure: yes
 
 ##########################################################
 ## Check for errors in markdown files