diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7fc6eb..9e5f3a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,4 @@
-image: docker:stable
-
-stages:
-        - build
-
-variables:
-        IMAGE_NAME: registry.gitlab.com/wolutator/mariadb-with-ldap-pam
-        HUB_IMAGE_NAME: wollud1969/mariadb-with-ldap-pam
-
-build:
-        stage: build
-        tags:
-                - hottis
-                - linux
-                - docker
-        script:
-                - VERSION=`cat VERSION`
-                - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:latest .
-                - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-                - docker push $IMAGE_NAME:latest
-                - docker push $IMAGE_NAME:$VERSION
-                - docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD
-                - docker push $HUB_IMAGE_NAME:latest
-                - docker push $HUB_IMAGE_NAME:$VERSION
-
+include:
+        - project: dockerized/commons
+          ref: master
+          file: gitlab-ci-template.yml
diff --git a/Dockerfile b/Dockerfile
index 19cf4fd..398e48c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,6 @@
-FROM mariadb:10.4
+FROM mariadb:10.4.22
 
 LABEL Maintainer="Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>"
-LABEL ImageName="registry.gitlab.com/wolutator/mariadb-with-ldap-pam"
-LABEL AlternativeImageName="wollud1969/mariadb-with-ldap-pam"
 
 ENV LDAPBASE "DC=hottis,DC=de"
 ENV LDAPURI "ldap://ldap.hottis.de:389"
@@ -10,9 +8,9 @@ ENV LDAPBINDDB ""
 ENV LDAPBINDPW ""
 
 RUN \
-  apt-get update && \
-  env DEBIAN_FRONTEND=noninteractive apt-get -yq install libpam-ldap && \
-  env DEBIAN_FRONTEND=noninteractive apt-get -yq install pamtester
+  apt update && \
+  env DEBIAN_FRONTEND=noninteractive apt -yq install libpam-ldap && \
+  env DEBIAN_FRONTEND=noninteractive apt -yq install pamtester
 
 COPY docker-entrypoint.sh-head /usr/local/bin
 COPY pam.conf-tail /etc