diff --git a/.github/workflows/scripts/zephyr-hal.sh b/.github/workflows/scripts/zephyr-hal.sh
index 8e37ec2282c..e7e272cd666 100644
--- a/.github/workflows/scripts/zephyr-hal.sh
+++ b/.github/workflows/scripts/zephyr-hal.sh
@@ -19,6 +19,10 @@ cd ${msdk}
 msdk_head=$(git rev-parse HEAD)
 cd ${root_dir}
 
+# Store msdk_sha file if exist
+if [ -e "${hal_adi}/MAX/msdk_sha" ]; then
+    mv ${hal_adi}/MAX/msdk_sha ${root_dir}
+fi
 
 # Cleanup hal_adi
 rm -rf ${hal_adi}/MAX/
@@ -32,6 +36,11 @@ mkdir -p ${hal_adi}/MAX/Libraries/PeriphDrivers
 # Copy zephyr wrappers, system files and cmakefiles
 cp -rf ${msdk}/Libraries/zephyr/MAX/*  ${hal_adi}/MAX/
 
+# Move "msdk_sha" file again to not create a difference.
+if [ -e "${root_dir}/msdk_sha" ]; then
+    mv ${root_dir}/msdk_sha ${hal_adi}/MAX
+fi
+
 # Copy CMSIS folder
 cp -rf ${msdk}/Libraries/CMSIS/Device  ${hal_adi}/MAX/Libraries/CMSIS/
 cp -rf ${msdk}/Libraries/CMSIS/Include ${hal_adi}/MAX/Libraries/CMSIS/
diff --git a/.github/workflows/zephyr-hal.yml b/.github/workflows/zephyr-hal.yml
index ad6c917d332..491b98b50fe 100644
--- a/.github/workflows/zephyr-hal.yml
+++ b/.github/workflows/zephyr-hal.yml
@@ -69,10 +69,19 @@ jobs:
 
       - name: Push changes to hal_adi repository
         run: |
-          echo "$(pwd) - $(ls)"
+          echo -e "$(pwd)\n\n$(ls)\n"
           cd ./hal_adi
-          git config --global user.email "actions@github.com"
-          git config --global user.name "GitHub Actions"
-          git add *
-          git commit -m "Update Zephyr MSDK Hal based on MSDK PR: https://github.com/analogdevicesinc/msdk/pull/${PR_NUM}"
-          git push 
+          if [[ -n $(git status -s) ]]; then
+            echo "Starting to commit changes to hal_adi repository"
+            cd ${msdk}
+            msdk_head=$(git rev-parse HEAD)
+            commit_author=$(git show --no-patch --format="%an <%ae>" ${msdk_head})
+            commit_msg=$(git show --no-patch --format="%B" ${msdk_head})
+
+            cd ${hal_adi}
+            git add *
+            git commit --author="${commit_author}" -m "${commit_msg}"
+            git push
+          else
+            echo "No changes to commit"
+          fi