diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7046f3115839982e25e479347ef7bbf2f7ee9f19..0855ba29797a0fac35b8c5e6ba13aeea37565383 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,26 @@
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 
-build-master:
+php-7.0:
   stage: build
   script:
-    - docker build --pull -t $CI_REGISTRY_IMAGE .
-    - docker push $CI_REGISTRY_IMAGE
+    - docker build --pull --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 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
+  script:
+    - docker build --pull --build-arg PHP_VERSION=7.2 -t $CI_REGISTRY_IMAGE:php-7.2 .
+    - docker push $CI_REGISTRY_IMAGE:php-7.2
   only:
     - master
diff --git a/Dockerfile b/Dockerfile
index 9b669ce33d72704147918ec26514a5701a076c8d..83aa94690b08a82fbe1a03be9e831c8cf0455f49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM registry.lakedrops.com/docker/gitlab-drupal-ci
+ARG PHP_VERSION
+
+FROM registry.lakedrops.com/docker/gitlab-drupal-ci:php-$PHP_VERSION
 
 LABEL com.example.vendor="LakeDrops" \
       maintainer="juergen.haas@lakedrops.com" \