diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef532d2a2ebc8e2a1a11be5b9703c1e0be400474..870ea0005d22f12c76f2fb912f300b2e24f08da2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,8 @@ build_image:
     - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY
     - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+    - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" "$CI_REGISTRY_IMAGE:latest"
+    - docker push "$CI_REGISTRY_IMAGE:latest"
   only:
     - tags
   tags:
diff --git a/Dockerfile b/Dockerfile
index 06daa7a1ee68a45f4f7f601c55c27a5055fce6d3..b378a4b8d7cbb33db5b7877436f3a976cd907d04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,5 @@
-FROM library/ubuntu:16.04
-MAINTAINER Florian Thöni <florian.thoni@floth.fr>
+FROM debian:bookworm-slim
 
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update; \
-   apt-get install -y curl apt-transport-https ca-certificates; \
-   apt-get update; \
-   apt-get install -y docker docker-compose git; \
-   apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN apt update && \
+   apt install --yes docker git && \
+   rm -rf /var/lib/apt/lists/*