diff --git a/Dockerfile b/Dockerfile
index 558c70e2e07d5008df3e5766263d908cf3f9c8e8..611271591238f511ab661f00bda9d91db4e76ad5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,22 @@
 FROM buildpack-deps:buster-curl
 
 RUN apt-get update && apt-get install -y ca-certificates libgs9 mime-support && \
-apt-get clean autoclean && \
-apt-get autoremove --yes && \
-rm -rf /var/lib/{apt,dpkg,cache,log} 
+	&& apt-get clean autoclean \
+	&& apt-get autoremove --yes \
+        && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /srv
+
+ONBUILD ARG CI_COMMIT_REF_NAME
+ONBUILD ARG CI_COMMIT_SHA
+
+ONBUILD ARG CI_PROJECT_NAME
+ONBUILD ENV CI_PROJECT_NAME ${CI_PROJECT_NAME}
+
+ONBUILD ARG CI_PROJECT_NAMESPACE
+ONBUILD ENV CI_PROJECT_NAMESPACE ${CI_PROJECT_NAMESPACE}
+
+ONBUILD LABEL project=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME
+