diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f290642995f81724ecbb3aecffb85227dc69b008..127d4f56c9058584182198996238ca9619ebdc83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,18 @@
-image: ikus060/docker-debian-py2-py3:stretch
+image: $DOCKER_REGISTRY/pdsl/rdiffweb-build
 
 stages:
+- prebuild
 - test
 - publish
 
-# Upgrade python and install dependencies to avoid compiling from sources.
-before_script:
-- apt-get update && apt-get -qq install python-pysqlite2 libldap2-dev libsasl2-dev rdiff-backup node-less
-- pip install pip setuptools --upgrade
+prebuild-docker-image:
+  image: docker:stable
+  stage: prebuild
+  script:
+  - docker login $DOCKER_REGISTRY -u $DOCKER_USR -p $DOCKER_PWD
+  - docker build -t rdiffweb-build extras/prebuild
+  - docker tag rdiffweb-build $DOCKER_REGISTRY/pdsl/rdiffweb-build
+  - docker push $DOCKER_REGISTRY/pdsl/rdiffweb-build
 
 .tox:  &tox
   stage: test
@@ -124,12 +129,3 @@ publish_pypi:
   - pip install wheel twine --upgrade
   - python setup.py sdist bdist_wheel
   - twine upload dist/* -u $PYPI_USR -p $PYPI_PWD
-  
-github_push:
-  stage: publish
-  only:
-  - branches
-  script:
-  - git push --force https://${GITHUB_USR}:${GITHUB_PWD}@github.com/ikus060/rdiffweb.git refs/remotes/origin/${CI_COMMIT_REF_NAME}:refs/heads/${CI_COMMIT_REF_NAME}
-  - git push https://${GITHUB_USR}:${GITHUB_PWD}@github.com/ikus060/rdiffweb.git --tags
-
diff --git a/extras/prebuild/Dockerfile b/extras/prebuild/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..9571b736dff73b3d8304bc1062cca3d46d8893d0
--- /dev/null
+++ b/extras/prebuild/Dockerfile
@@ -0,0 +1,5 @@
+FROM ikus060/docker-debian-py2-py3:stretch
+
+RUN apt-get update && \
+  apt-get -qq install python-pysqlite2 libldap2-dev libsasl2-dev rdiff-backup node-less && \
+  pip install pip setuptools --upgrade