diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index f6718cf182e3ba827cdc82568d7b94655925a656..e582dcb100017aa12895ca89d632dbb816ab0958 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -16,7 +16,7 @@
     - export GOPATH=$CI_PROJECT_DIR/.go
     - mkdir -p $GOPATH
     - source scripts/utils.sh
-    - log_disk_usage # https://gitlab.com/gitlab-org/gitlab/-/issues/478880
+    - log_disk_usage before_script # https://gitlab.com/gitlab-org/gitlab/-/issues/478880
 
 .default-before_script:
   before_script:
diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml
index 16d023f49b2d7c063e333a4c76b16e9059633c95..d9637e76ae74604f4a975086416d3a34b4f85e03 100644
--- a/.gitlab/ci/rails/shared.gitlab-ci.yml
+++ b/.gitlab/ci/rails/shared.gitlab-ci.yml
@@ -102,6 +102,7 @@ include:
     - rspec_section rspec_parallelized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~level:background_migration --tag ~click_house"
   after_script:
     - source scripts/utils.sh
+    - log_disk_usage after_script # https://gitlab.com/gitlab-org/gitlab/-/issues/478880
     - bundle exec gem list gitlab_quality-test_tooling
     - |
       section_start "failed-test-issues" "Report test failures"
diff --git a/scripts/utils.sh b/scripts/utils.sh
index e12eccc6d7bbe939f6efcfc52613ec0e664c3a56..2210313598bd1440b8f0633a392b5247ae1891f7 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -480,9 +480,14 @@ function define_trigger_branch_in_build_env() {
 }
 
 function log_disk_usage() {
+  caller=$1
+  echo "[log_disk_usage ${caller}] start"
+
   echo -e "df -h"
   df -h
 
   echo -e "\n\nls -lhS tmp"
   ls -lhS tmp
+
+  echo "[log_disk_usage ${caller}] end"
 }