diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cab8396fcff347b9f27a375b5a0c99ad6e7686d..4dbdb04022c18887dfc06bba1fcbe601dc070bfa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,6 +68,7 @@ build:
     - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
     - test $FORCE_RECREATE && docker rm -f $(docker ps -q) || true
     - docker-compose -f docker-compose.yml -f docker-compose.ci.yml push
+    - ./ci/tag_latest.sh
 
 .deploy: &deploy_template
   stage: deploy
diff --git a/ci/tag_latest.sh b/ci/tag_latest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a750c6c67ad1ce3b6987e36bd8d7c4bc384b054c
--- /dev/null
+++ b/ci/tag_latest.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for image in api webserver
+do
+  docker tag ${CI_REGISTRY_IMAGE}/${image}:${CI_COMMIT_SHA} ${CI_REGISTRY_IMAGE}/${image}:latest
+  docker push ${CI_REGISTRY_IMAGE}/${image}:latest
+done
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index f3c7d7970bed953c794c04cd9040fbcac0d8c53b..e0e67fa33e0716c0d7280e4b1872848ca5ce1ebb 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -2,6 +2,8 @@ version: '3'
 services:
   hub:
     image: ${CI_REGISTRY_IMAGE}/api:${CI_COMMIT_SHA}
+    cache_from: image: ${CI_REGISTRY_IMAGE}/api:latest
 
   webserver:
     image: ${CI_REGISTRY_IMAGE}/webserver:${CI_COMMIT_SHA}
+    cache_from: image: ${CI_REGISTRY_IMAGE}/webserver:latest