diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..6c51b3c
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,8 @@
+version: 2.1
+orbs:
+  shellcheck: circleci/shellcheck@2.2.4
+workflows:
+  check-scripts:
+    jobs:
+      - shellcheck/check:
+          dir: ./scripts
diff --git a/scripts/upgrade-from-mattermost-docker.sh b/scripts/upgrade-from-mattermost-docker.sh
index 19fdd2c..30c5587 100755
--- a/scripts/upgrade-from-mattermost-docker.sh
+++ b/scripts/upgrade-from-mattermost-docker.sh
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-set -e
+set -o errexit
 
 ##
 ## Instructions