diff --git a/.github/workflows/check-whitespace.yaml b/.github/workflows/check-whitespace.yaml
new file mode 100644
index 00000000..8b6ed68c
--- /dev/null
+++ b/.github/workflows/check-whitespace.yaml
@@ -0,0 +1,51 @@
+name: Check trailing white spaces before merge
+
+on:
+  pull_request:
+  push:
+    branches: [ "main" ]
+    paths:
+      - .github/workflows/check-whitespace.yaml
+
+jobs:
+  check-whitespace:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Get Changed Files
+      id: changed-files
+      uses: tj-actions/changed-files@v45
+      with:
+        files: |
+          **/application.properties
+
+
+    - name: Check white spaces scripts
+      env:
+        ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
+      run: |
+
+        tw_lines=""
+
+        for file in ${ALL_CHANGED_FILES}
+        do
+        lines=$(egrep -rnIH " +$" $file | cut -f-2 -d ":")
+        if [ ! -z "$lines" ]; then
+            tw_lines+=$([[ -z "$tw_lines" ]] && echo "$lines" || echo $'\n'"$lines")
+        fi
+        done
+
+        exit_code=0
+
+        # If tw_lines is not empty, change the exit code to 1 to fail the CI.
+        if [ ! -z "$tw_lines" ]; then
+        echo -e "\n***** Lines containing trailing whitespace *****\n"
+        echo -e "${tw_lines[@]}"
+        echo -e "\nFailed.\n"
+        exit_code=1
+        fi
+
+        exit $exit_code
+
+
diff --git a/mta-v6.x/application.properties b/mta-v6.x/application.properties
index 5130f82d..dfe37604 100644
--- a/mta-v6.x/application.properties
+++ b/mta-v6.x/application.properties
@@ -11,4 +11,6 @@ quarkus.openapi-generator.notifications.auth.BearerToken.bearer-token=${NOTIFICA
 # Possible values: OFF, FATAL, ERROR, WARN, INFO, DEBUG, ALL.
 # and see https://quarkus.io/guides/logging for documentation
 quarkus.log.category."org.apache.http".level=INFO
-quarkus.log.level=INFO
\ No newline at end of file
+quarkus.log.level=INFO
+
+# HEY
\ No newline at end of file
diff --git a/mta-v7.x/application.properties b/mta-v7.x/application.properties
index 5130f82d..b598d45d 100644
--- a/mta-v7.x/application.properties
+++ b/mta-v7.x/application.properties
@@ -11,4 +11,7 @@ quarkus.openapi-generator.notifications.auth.BearerToken.bearer-token=${NOTIFICA
 # Possible values: OFF, FATAL, ERROR, WARN, INFO, DEBUG, ALL.
 # and see https://quarkus.io/guides/logging for documentation
 quarkus.log.category."org.apache.http".level=INFO
-quarkus.log.level=INFO
\ No newline at end of file
+quarkus.log.level=INFO
+
+# HEY
+# HEYY
\ No newline at end of file