diff --git a/bash/.config/bash/01_exports.bash b/bash/.config/bash/01_exports.bash
index 8e4f95b..fe18805 100644
--- a/bash/.config/bash/01_exports.bash
+++ b/bash/.config/bash/01_exports.bash
@@ -1,3 +1,4 @@
+# shellcheck shell=bash
 # History
 mkdir -p "${XDG_STATE_HOME}"/bash
 export HISTFILE="${XDG_STATE_HOME}"/bash/history
diff --git a/bash/.config/bash/10_completions.bash b/bash/.config/bash/10_completions.bash
index d8f5280..e69d824 100644
--- a/bash/.config/bash/10_completions.bash
+++ b/bash/.config/bash/10_completions.bash
@@ -1,2 +1,3 @@
+# shellcheck shell=bash
 # SSH completion based on ssh config
 [ -e "$HOME/.ssh/config" ] && complete -o "default" -o "nospace" -W "$(grep "^Host" ~/.ssh/config* | grep -v "[?*]" | cut -d " " -f2- | tr ' ' '\n')" scp sftp ssh
diff --git a/shell-common/.config/shell-common/02_xdg_overrides.sh b/shell-common/.config/shell-common/02_xdg_overrides.sh
index c5b1eab..8f3b4d1 100644
--- a/shell-common/.config/shell-common/02_xdg_overrides.sh
+++ b/shell-common/.config/shell-common/02_xdg_overrides.sh
@@ -1,3 +1,4 @@
+# shellcheck shell=bash
 # Override application locations to fix XDG
 export ANSIBLE_HOME="$XDG_DATA_HOME"/ansible
 export LESSHISTFILE="$XDG_STATE_HOME"/less/history
diff --git a/shell-common/.config/shell-common/99_aws.sh b/shell-common/.config/shell-common/99_aws.sh
index 387a393..45a0bd6 100644
--- a/shell-common/.config/shell-common/99_aws.sh
+++ b/shell-common/.config/shell-common/99_aws.sh
@@ -1,4 +1,5 @@
 # shellcheck shell=bash
+# AWS functions
 
 # Get the list of AWS profiles
 function awsprofiles() {
diff --git a/shell-common/.config/shell-common/99_go.sh b/shell-common/.config/shell-common/99_go.sh
index 33bb76b..bee7c13 100644
--- a/shell-common/.config/shell-common/99_go.sh
+++ b/shell-common/.config/shell-common/99_go.sh
@@ -1,4 +1,6 @@
+# shellcheck shell=bash
 # Go stuff
+
 export GOPATH=$XDG_DATA_HOME/go/
 export PATH=${GOPATH}bin:$PATH
 if [ -z ${GOROOT+x} ] && [ -d /usr/local/go ]; then
diff --git a/shell-common/.config/shell-common/99_python.sh b/shell-common/.config/shell-common/99_python.sh
index 999cebb..1a23679 100644
--- a/shell-common/.config/shell-common/99_python.sh
+++ b/shell-common/.config/shell-common/99_python.sh
@@ -1,2 +1,4 @@
+# shellcheck shell=bash
 # Python stuff
+
 export POETRY_VIRTUALENVS_IN_PROJECT=true
diff --git a/shell-common/.config/shell-common/99_rust.sh b/shell-common/.config/shell-common/99_rust.sh
index 08e7e87..63defde 100644
--- a/shell-common/.config/shell-common/99_rust.sh
+++ b/shell-common/.config/shell-common/99_rust.sh
@@ -1,4 +1,6 @@
+# shellcheck shell=bash
 # Rust stuff
+
 if [ -f $HOME/.cargo/env ]; then
     source $HOME/.cargo/env
 fi
diff --git a/zsh/.config/zsh/01_exports.zsh b/zsh/.config/zsh/01_exports.zsh
index 44119ae..66ab2c5 100644
--- a/zsh/.config/zsh/01_exports.zsh
+++ b/zsh/.config/zsh/01_exports.zsh
@@ -1,3 +1,4 @@
+# shellcheck shell=zsh
 # History
 mkdir -p "${XDG_STATE_HOME}/zsh"
 HISTFILE="${XDG_STATE_HOME}/zsh/history"
diff --git a/zsh/.config/zsh/10_aliases.zsh b/zsh/.config/zsh/10_aliases.zsh
index e2d930a..ed56048 100644
--- a/zsh/.config/zsh/10_aliases.zsh
+++ b/zsh/.config/zsh/10_aliases.zsh
@@ -1,3 +1,4 @@
+# shellcheck shell=zsh
 # Zsh specific aliases
 # Mostly suffix and global aliases
 
diff --git a/zsh/.config/zsh/10_completions.zsh b/zsh/.config/zsh/10_completions.zsh
index bcebd2c..3488df2 100644
--- a/zsh/.config/zsh/10_completions.zsh
+++ b/zsh/.config/zsh/10_completions.zsh
@@ -1,3 +1,4 @@
+# shellcheck shell=zsh
 fpath+=($XDG_CONFIG_HOME/zsh/completions)
 
 autoload -Uz compinit
diff --git a/zsh/.zshrc b/zsh/.zshrc
index e1224b5..f53c4aa 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,3 +1,4 @@
+# shellcheck shell=zsh
 # Source shell common
 for f in ~/.config/shell-common/*.sh; do
     source $f