diff --git a/.gitlab-ci.d/templates.yaml b/.gitlab-ci.d/templates.yaml
index 503056792..396772490 100644
--- a/.gitlab-ci.d/templates.yaml
+++ b/.gitlab-ci.d/templates.yaml
@@ -1,151 +1,151 @@
 # yaml-language-server: $format.enable=false, $schemaStore.enable=true, $schemas=gitlab-ci
 
 # Configuration template
 .configure:
   stage: configure
   variables:
     BLA_VENDOR: "Generic"
     CMAKE_GENERATOR: "Unix Makefiles"
   #    CMAKE_GENERATOR: 'Ninja'
   cache:
     - key: ${CI_COMMIT_REF_SLUG}-third-party
       policy: push
       paths:
         - third-party/eigen3
         - third-party/pybind11
         - third-party/google-test
     - key: ${output}_${BUILD_TYPE}-ccache
-      policy: push-pull
+      policy: pull-push
       paths:
         - .ccache/
   script:
     # Create the build folder
     - cmake -E make_directory build
     - cd build
     - echo BUILD_TYPE=${BUILD_TYPE}
 
     # Configure the project
     - cmake -DAKANTU_COHESIVE_ELEMENT:BOOL=TRUE
       -DAKANTU_IMPLICIT:BOOL=TRUE
       -DAKANTU_IMPLICIT_SOLVER:STRING="Mumps"
       -DAKANTU_PARALLEL:BOOL=TRUE
       -DAKANTU_STRUCTURAL_MECHANICS:BOOL=TRUE
       -DAKANTU_HEAT_TRANSFER:BOOL=TRUE
       -DAKANTU_DAMAGE_NON_LOCAL:BOOL=TRUE
       -DAKANTU_PHASE_FIELD:BOOL=TRUE
       -DAKANTU_PYTHON_INTERFACE:BOOL=TRUE
       -DAKANTU_CONTACT_MECHANICS:BOOL=TRUE
       -DAKANTU_EXAMPLES:BOOL=TRUE
       -DAKANTU_BUILD_ALL_EXAMPLES:BOOL=TRUE
       -DAKANTU_TESTS:BOOL=TRUE
       -DAKANTU_RUN_IN_DOCKER:BOOL=TRUE
       -DAKANTU_TEST_EXAMPLES:BOOL=${TEST_EXAMPLES}
       -DCMAKE_BUILD_TYPE:STRING=${BUILD_TYPE}
       -G "${CMAKE_GENERATOR}" ..
 
     # Copy the compile commands for the code quality
     - if [ -e compile_commands.json ]; then
     - cp compile_commands.json ..
     - fi
   artifacts:
     when: on_success
     paths:
       - build
       - compile_commands.json
     expire_in: 10h
 
 # Build the libraries
 .build_libs:
   stage: build_libs
   script:
     - echo BUILD_TYPE=${BUILD_TYPE}
     - cmake --build build/src
       > >(tee -a build-${output}-out.log)
       2> >(tee -a build-${output}-err.log >&2)
     - cmake --build build/python
       > >(tee -a build-${output}-out.log)
       2> >(tee -a build-${output}-err.log >&2)
   cache:
     - key: ${output}_${BUILD_TYPE}_build_${CI_COMMIT_SHORT_SHA}
       policy: push
       paths:
         - build/
     - key: ${CI_COMMIT_REF_SLUG}-third-party
       policy: pull
     - key: ${output}_${BUILD_TYPE}-ccache
-      policy: push-pull
+      policy: pull-push
       paths:
         - .ccache/
   artifacts:
     when: on_success
     paths:
       - build-${output}-err.log
       - compile_commands.json
     expire_in: 10h
   timeout: 5h
 
 # build the tests
 .build_tests:
   stage: build_tests
-  script:
-    - cmake --build build/test
-      > >(tee -a build-${output}-out.log)
-      2> >(tee -a build-${output}-err.log >&2)
-    - cmake --build build/examples
-      > >(tee -a build-${output}-out.log)
-      2> >(tee -a build-${output}-err.log >&2)
   cache:
     - key: ${output}_${BUILD_TYPE}_build_${CI_COMMIT_SHORT_SHA}
       policy: pull-push
       paths:
         - build/
     - key: ${CI_COMMIT_REF_SLUG}-third-party
       policy: pull
     - key: ${output}_${BUILD_TYPE}-ccache
-      policy: push-pull
+      policy: pull-push
       paths:
         - .ccache/
+  script:
+    - cmake --build build/test
+      > >(tee -a build-${output}-out.log)
+      2> >(tee -a build-${output}-err.log >&2)
+    - cmake --build build/examples
+      > >(tee -a build-${output}-out.log)
+      2> >(tee -a build-${output}-err.log >&2)
   artifacts:
     when: on_success
     paths:
       - build-${output}-err.log
       - compile_commands.json
     expire_in: 10h
 
 # Run the tests
 .tests:
   stage: test
   script:
     - cd build
     - ctest -T test --output-on-failure --no-compress-output --timeout 1800
   after_script:
     - cd build
     - tag=$(head -n 1 < Testing/TAG)
     - if [ -e Testing/${tag}/Test.xml ]; then
     - xsltproc -o ./juint.xml ${CI_PROJECT_DIR}/test/ci/ctest2junit.xsl Testing/${tag}/Test.xml;
     - fi
     - if [ ${BUILD_TYPE} = "Coverage" ]; then
     - gcovr --xml
       --gcov-executable "${GCOV_EXECUTABLE}"
       --xml-pretty
       --exclude-unreachable-branches
       --print-summary
       --output coverage.xml
       --object-directory ${CI_PROJECT_DIR}/build
       --root ${CI_PROJECT_DIR}  -s || true
     - fi
   cache:
     key: ${output}_${BUILD_TYPE}_build_${CI_COMMIT_SHORT_SHA}
     policy: pull
   artifacts:
     when: always
     expire_in: 2 days
     paths:
       - build/juint.xml
       - build/coverage.xml
     reports:
       junit:
         - build/juint.xml
       coverage_report:
         coverage_format: cobertura
         path: build/coverage.xml