diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2d73d7ac5909d6554c455b7f23c77d6ab6c891b..38c1cc0af249257776049df02074f8582ecf8009 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,21 @@
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 
-php-7.0:
-  stage: build
-  script:
-    - docker build --pull --build-arg ALPINE_VERSION=3.5 --build-arg PHP_VERSION=7.0 -t $CI_REGISTRY_IMAGE:php-7.0 .
-    - docker push $CI_REGISTRY_IMAGE:php-7.0
-  only:
-    - master
+#php-7.0:
+#  stage: build
+#  script:
+#    - docker build --pull --build-arg ALPINE_VERSION=3.5 --build-arg PHP_VERSION=7.0 -t $CI_REGISTRY_IMAGE:php-7.0 .
+#    - docker push $CI_REGISTRY_IMAGE:php-7.0
+#  only:
+#    - master
 
-php-7.1:
-  stage: build
-  script:
-    - docker build --pull --build-arg ALPINE_VERSION=3.7 --build-arg PHP_VERSION=7.1 -t $CI_REGISTRY_IMAGE:php-7.1 .
-    - docker push $CI_REGISTRY_IMAGE:php-7.1
-  only:
-    - master
+#php-7.1:
+#  stage: build
+#  script:
+#    - docker build --pull --build-arg ALPINE_VERSION=3.7 --build-arg PHP_VERSION=7.1 -t $CI_REGISTRY_IMAGE:php-7.1 .
+#    - docker push $CI_REGISTRY_IMAGE:php-7.1
+#  only:
+#    - master
 
 php-7.2:
   stage: build
diff --git a/Dockerfile b/Dockerfile
index 0ed31ff30a62efc05a7f91b40c60947589d6a459..b5749e6338890ea178ca3c7fcb0b1a9435f140f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,17 +2,18 @@ FROM alpine:3.8
 
 LABEL com.example.vendor="LakeDrops" \
       maintainer="juergen.haas@lakedrops.com" \
-      version="1.5.2" \
       description="An image for GitLab runner to build and test Drupal projects."
 
 ARG ALPINE_VERSION
 ARG PHP_VERSION
-ARG compose_version=1.21.2
+ARG compose_version=1.25.1
 ARG glibc_version=2.28-r0
 ARG apkArch
 ARG dockerArch
 ARG DOCKER_CHANNEL=stable
-ARG DOCKER_VERSION=18.06.1-ce
+ARG DOCKER_VERSION=19.03.5
+ARG GIT_EXTRAS_VERSION=4.7.0
+ARG AHOY_VERSION=2.0.0
 
 RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     set -eux && \
@@ -41,7 +42,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     echo "StrictHostKeyChecking no" >> /root/.ssh/config && \
     \
     apk update && \
-    apk add --no-cache openssh wget make patch bash fish python git git-lfs unzip acl && \
+    apk add --no-cache openssh wget make patch bash fish python3 git git-lfs unzip acl && \
     \
     wget -q https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -O /etc/apk/keys/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${glibc_version}/glibc-${glibc_version}.apk && \
@@ -51,8 +52,10 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     ln -s /lib/libc.musl-x86_64.so.1 /usr/glibc-compat/lib && \
     ln -s /usr/lib/libgcc_s.so.1 /lib/libgcc_s.so.1 && \
     ln -s /lib/libgcc_s.so.1 /usr/glibc-compat/lib/ && \
+    ln -s python3 /usr/bin/python && \
+    ln -s pip3 /usr/bin/pip && \
     \
-    wget -q https://github.com/ahoy-cli/ahoy/releases/download/2.0.0/ahoy-bin-`uname -s`-amd64 -O /usr/local/bin/ahoy && \
+    wget -q https://github.com/ahoy-cli/ahoy/releases/download/${AHOY_VERSION}/ahoy-bin-`uname -s`-amd64 -O /usr/local/bin/ahoy && \
     chmod +x /usr/local/bin/ahoy && \
     \
     wget -q https://github.com/docker/compose/releases/download/${compose_version}/docker-compose-`uname -s`-`uname -m` -O /usr/local/bin/docker-compose && \
@@ -64,7 +67,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     git clone https://github.com/tj/git-extras.git && \
     cd git-extras && \
     #git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) && \
-    git checkout 4.7.0 && \
+    git checkout ${GIT_EXTRAS_VERSION} && \
     make install && \
     cd .. && \
     rm -rf git-extras && \