diff --git a/authentikos/test/integ-simple.sh b/authentikos/test/integ-simple.sh
index 6455d496722..d24d9f230e3 100755
--- a/authentikos/test/integ-simple.sh
+++ b/authentikos/test/integ-simple.sh
@@ -21,6 +21,7 @@ source "$ROOT/lib.sh"
 
 timout="5m"
 
+# shellcheck disable=SC2317
 get_tokeninfo() {
   local token
 
diff --git a/scripts/validate_schema.sh b/scripts/validate_schema.sh
index dbe02628335..20070f6e4e9 100755
--- a/scripts/validate_schema.sh
+++ b/scripts/validate_schema.sh
@@ -60,6 +60,7 @@ get_opts() {
     done
 }
 
+# shellcheck disable=SC2317
 validate_opts() {
     if [ -z "${DOCUMENT_PATH:-}" ]; then
         print_error_and_exit "DOCUMENT_PATH is a required option. It must be the path to the document to validate."
@@ -97,7 +98,6 @@ main() {
     validate_opts
 
     validate_schema
-    return 1
 }
 
 main "$@"
diff --git a/tools/automator/automator.sh b/tools/automator/automator.sh
index 4a70a0910df..819da65c741 100755
--- a/tools/automator/automator.sh
+++ b/tools/automator/automator.sh
@@ -22,6 +22,7 @@ ROOT="$(cd -P "$(dirname -- "$0")" && pwd -P)"
 # shellcheck disable=SC1090,SC1091
 source "$ROOT/utils.sh"
 
+# shellcheck disable=SC2317
 cleanup() {
   rm -rf "${tmp_dir:-}" "${tmp_token:-}" "${tmp_script:-}" "${tmp_git:-}"
 }
diff --git a/tools/check_release_notes.sh b/tools/check_release_notes.sh
index 8f941c242c8..08d3fe3cc65 100755
--- a/tools/check_release_notes.sh
+++ b/tools/check_release_notes.sh
@@ -35,6 +35,7 @@ print_error_and_exit() {
 RELEASE_NOTES_NONE_LABEL="release-notes-none"
 
 cleanup() {
+    # shellcheck disable=SC2317
     rm -rf "${tmp_token:-}"
 }
 
@@ -96,6 +97,7 @@ get_opts() {
 
 #This script relies on the REPO_OWNER, REPO_NAME, and PULL_NUMBER environment
 #variables as defined in https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md#job-environment-variables.
+# shellcheck disable=SC2317
 validate_opts() {
     if [[ "${JOB_TYPE:-}" == "batch" ]]; then
         echo "Release notes checker not applicable for batch jobs. Skipping"
@@ -251,7 +253,6 @@ main() {
     validateNotes
     checkForFiles
     checkForLabel
-    return 1
 }
 
 main "$@"