diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd37741..9038572 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ build:
   stage: build
   script:
     - apk add --no-cache bash
-    - /bin/bash -n gitlab-ci-*
+    - /bin/bash -n overlay/usr/share/gitlab-ci-common overlay/usr/bin/gitlab-ci-*
     - echo Building ${RELEASE_IMAGE}
     - docker build -t $TEST_IMAGE .
     - docker push $TEST_IMAGE
diff --git a/Dockerfile b/Dockerfile
index cedae9b..1aa28fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM debian:testing
-MAINTAINER hans@eds.org
+LABEL maintainer="hans@eds.org"
 
 ENV LANG=C.UTF-8 \
     DEBIAN_FRONTEND=noninteractive
@@ -29,15 +29,6 @@ RUN mkdir -p /usr/share/man/man1 \
 	&& apt-mark auto $build_deps \
 	&& rm -rf /var/lib/apt/lists/*
 
-COPY gitlab-ci-common /usr/share/
-COPY gitlab-ci-add-pages-repo /usr/bin/
-COPY gitlab-ci-aptly /usr/bin/
-COPY gitlab-ci-autopkgtest /usr/bin/
-COPY gitlab-ci-entrypoint /usr/bin/
-COPY gitlab-ci-git-buildpackage /usr/bin/
-COPY gitlab-ci-git-buildpackage-all /usr/bin/
-COPY gitlab-ci-lintian /usr/bin/
-COPY gitlab-ci-enable-sid /usr/bin/
-COPY gitlab-ci-enable-experimental /usr/bin/
+ADD overlay /
 
 ENTRYPOINT ["/usr/bin/gitlab-ci-entrypoint"]
diff --git a/gitlab-ci-add-pages-repo b/overlay/usr/bin/gitlab-ci-add-pages-repo
similarity index 100%
rename from gitlab-ci-add-pages-repo
rename to overlay/usr/bin/gitlab-ci-add-pages-repo
diff --git a/gitlab-ci-aptly b/overlay/usr/bin/gitlab-ci-aptly
similarity index 100%
rename from gitlab-ci-aptly
rename to overlay/usr/bin/gitlab-ci-aptly
diff --git a/gitlab-ci-autopkgtest b/overlay/usr/bin/gitlab-ci-autopkgtest
similarity index 100%
rename from gitlab-ci-autopkgtest
rename to overlay/usr/bin/gitlab-ci-autopkgtest
diff --git a/gitlab-ci-enable-experimental b/overlay/usr/bin/gitlab-ci-enable-experimental
similarity index 100%
rename from gitlab-ci-enable-experimental
rename to overlay/usr/bin/gitlab-ci-enable-experimental
diff --git a/gitlab-ci-enable-sid b/overlay/usr/bin/gitlab-ci-enable-sid
similarity index 100%
rename from gitlab-ci-enable-sid
rename to overlay/usr/bin/gitlab-ci-enable-sid
diff --git a/gitlab-ci-entrypoint b/overlay/usr/bin/gitlab-ci-entrypoint
similarity index 100%
rename from gitlab-ci-entrypoint
rename to overlay/usr/bin/gitlab-ci-entrypoint
diff --git a/gitlab-ci-git-buildpackage b/overlay/usr/bin/gitlab-ci-git-buildpackage
similarity index 100%
rename from gitlab-ci-git-buildpackage
rename to overlay/usr/bin/gitlab-ci-git-buildpackage
diff --git a/gitlab-ci-git-buildpackage-all b/overlay/usr/bin/gitlab-ci-git-buildpackage-all
similarity index 100%
rename from gitlab-ci-git-buildpackage-all
rename to overlay/usr/bin/gitlab-ci-git-buildpackage-all
diff --git a/gitlab-ci-lintian b/overlay/usr/bin/gitlab-ci-lintian
similarity index 100%
rename from gitlab-ci-lintian
rename to overlay/usr/bin/gitlab-ci-lintian
diff --git a/gitlab-ci-common b/overlay/usr/share/gitlab-ci-common
similarity index 100%
rename from gitlab-ci-common
rename to overlay/usr/share/gitlab-ci-common