diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d09c319..243f2b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,8 @@ stages:
 - release
 
 variables:
-  TEST_IMAGE: registry.gitlab.com/$CI_PROJECT_NAMESPACE/${CI_PROJECT_NAME}:$CI_BUILD_REF_NAME
-  RELEASE_IMAGE: registry.gitlab.com/$CI_PROJECT_NAMESPACE/${CI_PROJECT_NAME}:latest
+  TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
+  RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
 
 before_script:
   - echo $CI_BUILD_TOKEN | docker login -u gitlab-ci-token --password-stdin registry.gitlab.com
diff --git a/Dockerfile b/Dockerfile
index 5af32d3..139199a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,12 +4,8 @@ COPY signing-key.asc /
 
 RUN gpg --import /signing-key.asc
 
-RUN git clone --depth 1 https://gitlab.com/fdroid/fdroidserver.git \
-    && cd fdroidserver \
-    && pip3 install --upgrade babel pip setuptools \
-    && pip3 install --no-binary python-vagrant -e . \
-    && python3 setup.py compile_catalog build \
-    && python3 setup.py install
+RUN python3 -m pip install --upgrade pip wheel setuptools \
+    && python3 -m pip install git+https://gitlab.com/fdroid/fdroidserver.git
 
 # Install additional utilities required by actual builds (list subject to future expansion)
 # build-tools 32.0.0 is needed for a good apksigner
@@ -23,5 +19,5 @@ RUN apt-get update && apt-get install --yes \
 VOLUME ["/repo"]
 WORKDIR /repo
 
-ENTRYPOINT ["../fdroidserver/fdroid"]
+ENTRYPOINT ["/usr/local/bin/fdroid"]
 CMD ["--help"]