diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dcbc78c5d0371a36b1b941c4cd43c3d97604b22c..4f492b580ac2e1871f548f46108918afaa97ee64 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,26 +6,52 @@ services:
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 
+#
+# TESTS
+#
+
 lint_dockerfile:
   stage: test
   image: hadolint/hadolint:latest-debian
   script:
     - find . -name "Dockerfile" -execdir hadolint {} \;
 
+#
+# IMAGE BUILDS/PUSHES
+#
+
+# Golang
 build-golang-master:
-  stage: build
+  stage: deploy
   script:
-    - docker build --pull -t "$CI_REGISTRY/docker/images/golang:latest" ./golang/latest
-#    - docker push "$CI_REGISTRY/docker/images/golang:latest"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/golang:latest" ./golang/latest
+    - docker push "$CI_REGISTRY_IMAGE/golang:latest"
   only:
     - master
+  when: manual
 
 build-golang-dev:
-  stage: build
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/golang:latest-dev" ./golang/latest
+    - docker push "$CI_REGISTRY_IMAGE/golang:latest-dev"
+  except:
+    - master
+
+# PHP 7.3
+build-php-7.3-master:
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/php:7.3" ./php/7.3
+    - docker push "$CI_REGISTRY_IMAGE/php:7.3"
+  only:
+    - master
+  when: manual
+
+build-php-7.3-dev:
+  stage: deploy
   script:
-    - echo $CI_REGISTRY_IMAGE
-    - echo $CI_REGISTRY
-    - docker build --pull -t "$CI_REGISTRY/docker/images/golang:$CI_COMMIT_REF_SLUG" ./golang/latest
-#    - docker push "$CI_REGISTRY/docker/images/golang:$CI_COMMIT_REF_SLUG"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/php:7.3-dev" ./php/7.3
+    - docker push "$CI_REGISTRY_IMAGE/php:7.3-dev"
   except:
     - master