diff --git a/.github/main.workflow b/.github/main.workflow
index 6a7dccd65..a20540ba3 100644
--- a/.github/main.workflow
+++ b/.github/main.workflow
@@ -3,43 +3,32 @@ workflow "Shellcheck" {
   resolves = ["Buildroot Scripts", "Helper Scripts", "Board Scripts", "OS/sbin Scripts", "OS/libexec Scripts", "OS/rauc Scripts"]
 }
 
-action "Init Shellcheck" {
-  uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108"
-  args = "pull koalaman/shellcheck"
-}
-
 action "Helper Scripts" {
-  uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108"
-  args = "run run -v $(pwd):/mnt koalaman/shellcheck scripts/*.sh"
-  needs = ["Init Shellcheck"]
+  uses = "actions/bin/shellcheck@master"
+  args = "scripts/*.sh"
 }
 
 action "Buildroot Scripts" {
-  uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108"
-  args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh"
-  needs = ["Init Shellcheck"]
+  uses = "actions/bin/shellcheck@master"
+  args = "buildroot-external/scripts/*.sh"
 }
 
 action "Board Scripts" {
-  uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108"
-  args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/board/**/*.sh"
-  needs = ["Init Shellcheck"]
+  uses = "actions/bin/shellcheck@master"
+  args = "buildroot-external/board/**/*.sh"
 }
 
 action "OS/sbin Scripts" {
-  uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108"
-  args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/sbin/*"
-  needs = ["Init Shellcheck"]
+  uses = "actions/bin/shellcheck@master"
+  args = "buildroot-external/rootfs-overlay/usr/sbin/*"
 }
 
 action "OS/libexec Scripts" {
-  uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108"
-  args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/libexec/*"
-  needs = ["Init Shellcheck"]
+  uses = "actions/bin/shellcheck@master"
+  args = "buildroot-external/rootfs-overlay/usr/libexec/*"
 }
 
 action "OS/rauc Scripts" {
-  uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108"
-  args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/lib/rauc/*"
-  needs = ["Init Shellcheck"]
+  uses = "actions/bin/shellcheck@master"
+  args = "buildroot-external/rootfs-overlay/usr/lib/rauc/*"
 }
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 920bf0e97..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-language: bash
-
-sudo: required
-service: docker
-
-addons:
-  apt:
-    packages:
-     - docker-ce
-
-before_install:
-  - shopt -s globstar
-  - docker pull koalaman/shellcheck
-
-script:
- - docker run -v $(pwd):/mnt koalaman/shellcheck scripts/*.sh
- - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh
- - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh
- - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/board/**/*.sh
- - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/sbin/*
- - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/libexec/*
- - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/lib/rauc/*
-
-matrix:
-  fast_finish: true
diff --git a/buildroot-external/scripts/rauc.sh b/buildroot-external/scripts/rauc.sh
index 20f5d5888..b06748b65 100755
--- a/buildroot-external/scripts/rauc.sh
+++ b/buildroot-external/scripts/rauc.sh
@@ -78,6 +78,7 @@ function install_rauc_certs() {
 
 function install_bootloader_config() {
     if [ "${BOOTLOADER}" == "uboot" ]; then
+    	# shellcheck disable=SC1117
         echo -e "/dev/disk/by-partlabel/hassos-bootstate\t0x0000\t${BOOT_ENV_SIZE}" > "${TARGET_DIR}/etc/fw_env.config"
     else
         cp -f "${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb" "${TARGET_DIR}/etc/barebox-state.dtb"
diff --git a/buildroot-external/scripts/rootfs-layer.sh b/buildroot-external/scripts/rootfs-layer.sh
index 1c65b83ce..1592c5f80 100755
--- a/buildroot-external/scripts/rootfs-layer.sh
+++ b/buildroot-external/scripts/rootfs-layer.sh
@@ -29,6 +29,7 @@ function fix_rootfs() {
 
 function install_hassos_cli() {
 
+    # shellcheck disable=SC1117
     sed -i "s|\(root.*\)/bin/sh|\1/usr/sbin/hassos-cli|" "${TARGET_DIR}/etc/passwd"
     
     if ! grep "hassos-cli" "${TARGET_DIR}/etc/shells"; then