diff --git a/.github/workflows/retrieve_domains.yml b/.github/workflows/retrieve_domains.yml
index f85f21ec5..c5d29c4f3 100644
--- a/.github/workflows/retrieve_domains.yml
+++ b/.github/workflows/retrieve_domains.yml
@@ -29,6 +29,7 @@ jobs:
         run: bash functions/retrieve_domains.sh
 
       - name: Push
+        if: ${{ success() || failure() }}
         run: |
           git config user.email ${{ vars.GIT_EMAIL }}
           git config user.name ${{ vars.GIT_USERNAME }}
diff --git a/functions/retrieve_domains.sh b/functions/retrieve_domains.sh
index c9c1caa19..6812764c0 100644
--- a/functions/retrieve_domains.sh
+++ b/functions/retrieve_domains.sh
@@ -360,7 +360,7 @@ function log_source {
 }
 
 function format_list {
-    bash data/tools.sh "format" "$1"
+    bash functions/tools.sh "format" "$1"
 }
 
 function cleanup {
diff --git a/functions/test_functions.sh b/functions/test_functions.sh
index 52c12cd61..af658dd09 100644
--- a/functions/test_functions.sh
+++ b/functions/test_functions.sh
@@ -187,7 +187,7 @@ function test_retrieval_validate {
     elif [[ "$script_to_test" == 'validate' ]]; then
         cp input.txt "$raw_file"  # Input
         mv input.txt "$raw_light_file"  # Input
-        bash functions/validate_domains.sh || true  # Run lists check script and ignore exit status
+        bash functions/validate_raw.sh || true  # Run lists check script and ignore exit status
     fi
     printf "%s\n" "------------------------------------------------------------------"
 
diff --git a/data/tools.sh b/functions/tools.sh
similarity index 100%
rename from data/tools.sh
rename to functions/tools.sh