diff --git a/Makefile b/Makefile
index 189277e9e6c9657cfc9d2077c78a5d9f5d2b0eee..31b59c7e67b0d70da224be22fe91327e4dc1d0eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-REPO=heinloth/lp-build
+REPO=inf4/luci
 DOCKERFILES=$(sort $(wildcard */Dockerfile))
 TAGS=$(patsubst %/Dockerfile,%,$(DOCKERFILES))
 PUSHTAGS=$(addprefix push-,$(TAGS))
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..983c701e0d47be6d73e1398f0a0c9d190c8488c8
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+Luci build & test environment
+=============================
+
+Dockerfiles to create images of different distributions preinstalled with all required components to build and test Luci.
+
+They are located at
+
+    https://hub.docker.com/repository/docker/inf4/luci/general
+
+and are used to speed up the GitLab CI.
+
+
+Create Docker Images
+--------------------
+
+Run
+
+    docker login
+    make
+
+to create and push all images to Docker hub
+
diff --git a/almalinux-9/Dockerfile b/almalinux-9/Dockerfile
index 0d845eda77ed7f3819c38da02584dab8ec7bf6e7..4a2f6c126fd6e01e9b2efe190f4b979f30a67f84 100644
--- a/almalinux-9/Dockerfile
+++ b/almalinux-9/Dockerfile
@@ -1,11 +1,13 @@
 FROM almalinux:9
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/almalinux-9"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
-RUN yum install -y nano less file make diffutils gcc gcc-c++ clang
+RUN yum install -y clang diffutils gcc gcc-c++ file less make nano
diff --git a/debian-bookworm/Dockerfile b/debian-bookworm/Dockerfile
index e3d3592c05e7b5e7eae37643311a731706ffd762..9459c6c777aa07e294ac4845c65573fa384ccbd8 100644
--- a/debian-bookworm/Dockerfile
+++ b/debian-bookworm/Dockerfile
@@ -1,14 +1,16 @@
 FROM debian:bookworm
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/debian-bookworm"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
 RUN  ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime \
  && apt-get update \
- && apt-get install -y apt-transport-https ca-certificates build-essential file less nano clang gcc gccgo g++ gfortran gnat golang fpc rustc make libcap2-bin
+ && apt-get install -y apt-transport-https ca-certificates build-essential clang file fpc gcc gccgo git g++ gfortran gnat golang less libcap2-bin make nano rustc
diff --git a/debian-bullseye/Dockerfile b/debian-bullseye/Dockerfile
index b5f4079a0021824742edeae87190861daff569d4..1af2d2c8bb7c8c5f543479207f9d13ae03e485f1 100644
--- a/debian-bullseye/Dockerfile
+++ b/debian-bullseye/Dockerfile
@@ -1,14 +1,16 @@
 FROM debian:bullseye
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/debian-bullseye"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
 RUN  ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime \
  && apt-get update \
- && apt-get install -y apt-transport-https ca-certificates build-essential file less nano clang gcc gccgo g++ gfortran gnat golang fpc rustc make libcap2-bin
+ && apt-get install -y apt-transport-https ca-certificates build-essential clang file fpc gcc gccgo git g++ gfortran gnat golang less libcap2-bin make nano rustc
diff --git a/debian-buster/Dockerfile b/debian-buster/Dockerfile
index ecf31ce629a09d33733ea5e224cbdc248adc594c..61a44a6c6a7656540200307cc81b74d5669d1e63 100644
--- a/debian-buster/Dockerfile
+++ b/debian-buster/Dockerfile
@@ -1,14 +1,16 @@
 FROM debian:buster
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/debian-buster"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
 RUN  ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime \
  && apt-get update \
- && apt-get install -y apt-transport-https ca-certificates build-essential file less nano clang gcc gccgo g++ gfortran gnat golang fpc rustc make libcap2-bin
+ && apt-get install -y apt-transport-https ca-certificates build-essential clang file fpc gcc gccgo git g++ gfortran gnat golang less libcap2-bin make nano rustc
diff --git a/debian-stretch/Dockerfile b/debian-stretch/Dockerfile
index b5a1555e1ae620bb74ea06d819b46242b9c88a93..890ae6677edf4083cae674ece12c3b90857be033 100644
--- a/debian-stretch/Dockerfile
+++ b/debian-stretch/Dockerfile
@@ -1,17 +1,19 @@
 FROM debian:stretch
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/debian-stretch"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
 RUN  ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime \
  && sed -i -e '/stretch-updates/d' -e 's/\(security\|deb\).debian.org/archive.debian.org/' /etc/apt/sources.list \
  && apt-get update \
- && apt-get install -y apt-transport-https ca-certificates build-essential file less nano clang-11 gcc gccgo g++ gfortran gnat golang fpc rustc make libcap2-bin \
+ && apt-get install -y apt-transport-https ca-certificates build-essential clang-11 gcc gccgo git g++ file fpc gfortran gnat golang less libcap2-bin make nano rustc \
  && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 110 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-11
 
diff --git a/fedora-36/Dockerfile b/fedora-36/Dockerfile
index 520889bb542d943e0108ee1a34610db2d22d1de5..975c3c4d4d26ba75e66c969be550e831a0859b3e 100644
--- a/fedora-36/Dockerfile
+++ b/fedora-36/Dockerfile
@@ -1,11 +1,13 @@
 FROM fedora:36
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/fedora-36"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
-RUN yum install -y nano less file make diffutils gcc gcc-c++ clang
+RUN yum install -y clang diffutils gcc gcc-c++ file less make nano
diff --git a/fedora-37/Dockerfile b/fedora-37/Dockerfile
index 4e2907787582e121b704d490d15cda89a5c0a33b..7cb73a176722b83dd8334779e9daa053642b2f79 100644
--- a/fedora-37/Dockerfile
+++ b/fedora-37/Dockerfile
@@ -1,11 +1,13 @@
 FROM fedora:37
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/fedora-37"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
-RUN yum install -y nano less file make diffutils gcc gcc-c++ clang
+RUN yum install -y clang diffutils gcc gcc-c++ file less make nano
diff --git a/opensuseleap-15/Dockerfile b/opensuseleap-15/Dockerfile
index bda1a67a1d801432118f736844cff3d0bdcfecf3..1ac26c50f79da8e66105609e20a0c89354b7c595 100644
--- a/opensuseleap-15/Dockerfile
+++ b/opensuseleap-15/Dockerfile
@@ -1,11 +1,13 @@
 FROM opensuse/leap:15
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/opensuseleap-15"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
-RUN zypper install -y nano less file make libcap-progs gcc gcc-c++ clang
+RUN zypper install -y clang gcc gcc-c++ file less libcap-progs make nano
diff --git a/oraclelinux-9/Dockerfile b/oraclelinux-9/Dockerfile
index 1485bbab90731d1b066bd982304a42839daae694..3c0447a0aebd508b8284a87ab8b83e881d4a4718 100644
--- a/oraclelinux-9/Dockerfile
+++ b/oraclelinux-9/Dockerfile
@@ -1,11 +1,13 @@
 FROM oraclelinux:9
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/oraclelinux-9"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
-RUN yum install -y nano less file make diffutils gcc gcc-c++ clang
+RUN yum install -y clang diffutils gcc gcc-c++ file less make nano
diff --git a/rhel-9/Dockerfile b/rhel-9/Dockerfile
index 8e0fdb4ab4cede5a707997cce5c93bca6ba9dd4a..9c8b656ea5cae6f9718aa115e74238deb3529941 100644
--- a/rhel-9/Dockerfile
+++ b/rhel-9/Dockerfile
@@ -1,11 +1,13 @@
 FROM redhat/ubi9
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/rhel-9"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
-RUN yum install -y nano less file make diffutils gcc gcc-c++ clang
+RUN yum install -y clang diffutils gcc gcc-c++ file less make nano
diff --git a/ubuntu-focal/Dockerfile b/ubuntu-focal/Dockerfile
index 3a392408e1cd2fe5e00f8d0dafe41075a38d691c..153c126bff964fd421dd1e2e9a72b16781ac9ea9 100644
--- a/ubuntu-focal/Dockerfile
+++ b/ubuntu-focal/Dockerfile
@@ -1,14 +1,17 @@
 FROM ubuntu:focal
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/ubuntu-focal"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
+
 
 RUN  ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime \
  && apt-get update \
- && apt-get install -y apt-transport-https ca-certificates build-essential file less nano clang gcc gccgo g++ gfortran gnat golang fpc rustc make libcap2-bin libstdc++-10-dev
+ && apt-get install -y apt-transport-https ca-certificates build-essential clang file fpc gcc gccgo git g++ gfortran gnat golang less libcap2-bin libstdc++-10-dev make nano rustc
diff --git a/ubuntu-jammy/Dockerfile b/ubuntu-jammy/Dockerfile
index 4052fa769f6e7812c9c57600cda0016868c5062f..50e5fe14d30f431a413abc3a1b8f3f0f079b135f 100644
--- a/ubuntu-jammy/Dockerfile
+++ b/ubuntu-jammy/Dockerfile
@@ -1,14 +1,16 @@
 FROM ubuntu:jammy
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/ubuntu-jammy"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
 RUN  ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime \
  && apt-get update \
- && apt-get install -y apt-transport-https ca-certificates build-essential file less nano clang gcc gccgo g++ gfortran gnat golang fpc rustc make libcap2-bin
+ && apt-get install -y apt-transport-https ca-certificates build-essential clang cpplint file fpc gcc gccgo git g++ gfortran gnat golang less libcap2-bin libc++-dev make nano python3 python3-pyparsing rustc