diff --git a/script/static-checks/static-checks-banned-apis.sh b/script/static-checks/static-checks-banned-apis.sh
index 6a999e9..4bab6a7 100755
--- a/script/static-checks/static-checks-banned-apis.sh
+++ b/script/static-checks/static-checks-banned-apis.sh
@@ -7,13 +7,17 @@
 
 # static-checks-banned-apis.sh <path-to-root-folder> [patch]
 
+this_dir="$(readlink -f "$(dirname "$0")")"
+. $this_dir/common.sh
+
+
 LOG_FILE=$(mktemp -t banned-api-check.XXXX)
 
 if [[ "$2" == "patch" ]]; then
   echo "# Check for banned APIs in the patch"
   TEST_CASE="Banned API check on patch(es)"
   "$CI_ROOT/script/static-checks/check-banned-api.py" --tree "$1" \
-      --patch --from-ref origin/lts-v2.8 \
+      --patch --from-ref $(get_merge_base) \
       &> "$LOG_FILE"
 else
   echo "# Check for banned APIs in entire source tree"
diff --git a/script/static-checks/static-checks-check-copyright.sh b/script/static-checks/static-checks-check-copyright.sh
index ee92c92..9759b5f 100755
--- a/script/static-checks/static-checks-check-copyright.sh
+++ b/script/static-checks/static-checks-check-copyright.sh
@@ -6,6 +6,11 @@
 #
 
 # test-package-check-copyright.sh DIRECTORY
+
+this_dir="$(readlink -f "$(dirname "$0")")"
+. $this_dir/common.sh
+
+
 DIRECTORY="$1"
 
 TEST_CASE="Copyright headers of files modified by this patch"
@@ -14,7 +19,7 @@
 
 LOG_FILE=`mktemp -t common.XXXX`
 
-"$CI_ROOT"/script/static-checks/check-copyright.py --tree "$DIRECTORY" --patch &> "$LOG_FILE"
+"$CI_ROOT"/script/static-checks/check-copyright.py --tree "$DIRECTORY" --patch --from-ref $(get_merge_base) &> "$LOG_FILE"
 RES=$?
 
 if [ -s "$LOG_FILE" ]; then
diff --git a/script/static-checks/static-checks-coding-style-line-endings.sh b/script/static-checks/static-checks-coding-style-line-endings.sh
index bb0c4f4..785b054 100755
--- a/script/static-checks/static-checks-coding-style-line-endings.sh
+++ b/script/static-checks/static-checks-coding-style-line-endings.sh
@@ -5,7 +5,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-TEST_CASE="Line endings not valid"
+this_dir="$(readlink -f "$(dirname "$0")")"
+. $this_dir/common.sh
+
+
+TEST_CASE="Line endings are valid"
 
 EXIT_VALUE=0
 
@@ -15,8 +19,11 @@
 
 if [[ "$2" == "patch" ]]; then
     cd "$1"
-    parent=$(git merge-base HEAD refs/remotes/origin/lts-v2.8 | head -1)
-    git diff ${parent}..HEAD --no-ext-diff --unified=0 --exit-code -a --no-prefix | awk '/^\+/ && /\r$/' &> "$LOG_FILE"
+    shopt -s globstar
+    parent=$(get_merge_base)
+    git diff $parent..HEAD --no-ext-diff --unified=0 --exit-code -a \
+      --no-prefix **/*.{S,c,h,i,dts,dtsi,rst,mk} Makefile | \
+      awk '/^\+/ && /\r$/' &> "$LOG_FILE"
 else
   # For all the source and doc files
   # We only return the files that contain CRLF
diff --git a/script/static-checks/static-checks-coding-style.sh b/script/static-checks/static-checks-coding-style.sh
index 6d2ce79..4483b15 100755
--- a/script/static-checks/static-checks-coding-style.sh
+++ b/script/static-checks/static-checks-coding-style.sh
@@ -9,6 +9,10 @@
 # against the Linux coding style using the checkpatch.pl script from
 # the Linux kernel source tree.
 
+this_dir="$(readlink -f "$(dirname "$0")")"
+. $this_dir/common.sh
+
+
 TEST_CASE="Coding style on current patch"
 
 echo "# Check coding style on the last patch"
@@ -17,15 +21,10 @@
 
 LOG_FILE=$(mktemp -t coding-style-check.XXXX)
 
-# Make the patch against the specified remote branch
-if [ -n "$CODING_STYLE_BASE_BRANCH" ]; then
-	BASE_COMMIT="BASE_COMMIT=$CODING_STYLE_BASE_BRANCH"
-fi
-
 chmod +x $CI_ROOT/script/static-checks/checkpatch.pl
 
 CHECKPATCH=$CI_ROOT/script/static-checks/checkpatch.pl \
-  make checkpatch &> "$LOG_FILE"
+  make checkpatch BASE_COMMIT=$(get_merge_base) &> "$LOG_FILE"
 RES=$?
 
 if [[ "$RES" == 0 ]]; then
diff --git a/script/static-checks/static-checks-detect-newly-added-files.sh b/script/static-checks/static-checks-detect-newly-added-files.sh
index c2485fc..5b85ce6 100755
--- a/script/static-checks/static-checks-detect-newly-added-files.sh
+++ b/script/static-checks/static-checks-detect-newly-added-files.sh
@@ -11,6 +11,10 @@
 # It runs on every TF-A patch and detects the new files and updates
 # the patch contibutor to include them for Coverity Scan analysis.
 
+this_dir="$(readlink -f "$(dirname "$0")")"
+. $this_dir/common.sh
+
+
 LOG_FILE=$(mktemp -t files-detection-check.XXXX)
 TFA_PATCH_NEWFILES_LIST=$(mktemp -t tfa-patch-newfiles-list.XXXX)
 EXIT_VALUE=0
@@ -56,7 +60,7 @@
   echo "# Check to detect whether newly added files are analysed by Coverity in the patch"
   TEST_CASE="Newly added files detection check for Coverity Scan analysis on patch(es)"
 # Extracting newly added source files added between commits.
-  git diff origin/lts-v2.8...HEAD --name-only --diff-filter=A "*.c" &> "$TFA_PATCH_NEWFILES_LIST"
+  git diff $(get_merge_base)..HEAD --name-only --diff-filter=A "*.c" &> "$TFA_PATCH_NEWFILES_LIST"
   if [ -s "$TFA_PATCH_NEWFILES_LIST" ]
   then
     file_updation_report
diff --git a/script/static-checks/static-checks-include-order.sh b/script/static-checks/static-checks-include-order.sh
index ef5c670..364929c 100755
--- a/script/static-checks/static-checks-include-order.sh
+++ b/script/static-checks/static-checks-include-order.sh
@@ -7,13 +7,17 @@
 
 # unittest-include-order.sh <path-to-root-folder> [patch]
 
+this_dir="$(readlink -f "$(dirname "$0")")"
+. $this_dir/common.sh
+
+
 LOG_FILE=$(mktemp -t include-order-check.XXXX)
 
 if [[ "$2" == "patch" ]]; then
-  echo "# Check order of includes on the last patch"
-  TEST_CASE="Order of includes on the last patch(es)"
+  TEST_CASE="Order of includes on the patch series"
+  echo "# $TEST_CASE"
   "$CI_ROOT/script/static-checks/check-include-order.py" --tree "$1" \
-      --patch --from-ref origin/lts-v2.8 \
+      --patch --from-ref $(get_merge_base) \
       &> "$LOG_FILE"
 else
   echo "# Check order of includes of the entire source tree"