diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index 94defbcff1..eef183ffff 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -1,7 +1,7 @@
 .build_template:
   stage: build
   extends:
-    - .after_script:build:ccache-show-stats:upload-failed-job-logs
+    - .after_script:build
   image: $ESP_ENV_IMAGE
   tags: [build, shiny]
   variables:
@@ -13,7 +13,7 @@
   extends:
     - .build_template
     - .before_script:build
-    - .after_script:build:ccache-show-stats
+    - .after_script:build
   dependencies: # set dependencies to null to avoid missing artifacts issue
   needs:
     - job: fast_template_app
diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml
index c4c643e186..06b53fe859 100644
--- a/.gitlab/ci/common.yml
+++ b/.gitlab/ci/common.yml
@@ -224,7 +224,9 @@ variables:
 
 .show_ccache_statistics: &show_ccache_statistics |
   # Show ccache statistics if enabled globally
+  section_start "ccache_show_stats" "Show ccache statistics"
   test "$CI_CCACHE_STATS" == 1 && test -n "$(which ccache)" && ccache --show-stats -vv || true
+  section_end "ccache_show_stats"
 
 .upload_failed_job_log_artifacts: &upload_failed_job_log_artifacts |
   if [ $CI_JOB_STATUS = "failed" ]; then
@@ -244,19 +246,10 @@ variables:
     - export EXTRA_CFLAGS=${PEDANTIC_CFLAGS}
     - export EXTRA_CXXFLAGS=${PEDANTIC_CXXFLAGS}
 
-.after_script:build:ccache-show-stats:
+.after_script:build:
   after_script:
     - source tools/ci/utils.sh
-    - section_start "ccache_show_stats" "Show ccache statistics"
     - *show_ccache_statistics
-    - section_end "ccache_show_stats"
-
-.after_script:build:ccache-show-stats:upload-failed-job-logs:
-  after_script:
-    - source tools/ci/utils.sh
-    - section_start "ccache_show_stats" "Show ccache statistics"
-    - *show_ccache_statistics
-    - section_end "ccache_show_stats"
     - *upload_failed_job_log_artifacts
 
 ##############################
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index 590ff2f087..c5cc6fa0be 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -59,9 +59,6 @@
 .patterns-build_system_win: &patterns-build_system_win
   - "tools/test_build_system/**/*"
 
-.patterns-build_macos: &patterns-build_macos
-  - "tools/ci/test_configure_ci_environment.sh"
-
 .patterns-build_check: &patterns-build_check
   - "tools/test_build_system/**/*"
   - "tools/ci/test_configure_ci_environment.sh"
diff --git a/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml b/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
index 1fd97e93fa..af3e16bd77 100644
--- a/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
+++ b/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
@@ -7,7 +7,7 @@
 .dynamic_build_template:
   extends:
     - .before_script:build
-    - .after_script:build:ccache-show-stats:upload-failed-job-logs
+    - .after_script:build
   image: $ESP_ENV_IMAGE
   tags: [build, shiny]
   stage: build