diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0ea34a780c6a74480ec46ec64f23ddb09134687..305afaa35c035ee05399b3986aa01977fb0e158b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,50 +4,24 @@ variables:
 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_MAJOR_VERSION=7.0 --build-arg VERSION=${VERSION} -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_MAJOR_VERSION=7.1 --build-arg VERSION=${VERSION} -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 ALPINE_VERSION=3.8 --build-arg PHP_MAJOR_VERSION=7.2 --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-7.2 .
-    - docker push $CI_REGISTRY_IMAGE:php-7.2
-  only:
-    - master
-
-php-7.3:
-  stage: build
-  script:
-    - docker build --pull --build-arg ALPINE_VERSION=3.11 --build-arg PHP_MAJOR_VERSION=7.3 --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-7.3 .
-    - docker push $CI_REGISTRY_IMAGE:php-7.3
-  only:
-    - master
-
-php-7.4:
-  stage: build
-  script:
-    - docker build --pull --build-arg ALPINE_VERSION=3.11 --build-arg PHP_MAJOR_VERSION=7.4 --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-7.4 .
-    - docker push $CI_REGISTRY_IMAGE:php-7.4
-  only:
-    - master
-
-php-8.0:
+php:
   stage: build
+  parallel:
+    matrix:
+      #- ALPINE: 3.5
+      #  PHP: 7.0
+      #- ALPINE: 3.7
+      #  PHP: 7.1
+      - ALPINE: 3.8
+        PHP: 7.2
+      - ALPINE: 3.11
+        PHP: 7.3
+      - ALPINE: 3.11
+        PHP: 7.4
+      - ALPINE: 3.12
+        PHP: 8.0
   script:
-    - docker build --pull --build-arg ALPINE_VERSION=3.12 --build-arg PHP_MAJOR_VERSION=8.0 --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-8.0 .
-    - docker push $CI_REGISTRY_IMAGE:php-8.0
+    - docker build --pull --build-arg ALPINE_VERSION=${ALPINE} --build-arg PHP_MAJOR_VERSION=${PHP} --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-${PHP} .
+    - docker push $CI_REGISTRY_IMAGE:php-${PHP}
   only:
     - master