diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af2b06bdc2654addb3a8e3c1597c43f0fee75f55..b20b272dbbee0ac885f5cd6748d509b4385f0e6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,20 @@
 image: docker:stable
 
-#services:
-#  - docker:stable-dind
+services:
+  - docker:stable-dind
 
 variables:
   REPOSITORY: "aparapi/aparapi"
   VERSION: "2.0.0"
-  #DOCKER_HOST: "tcp://docker:2375"
-  #DOCKER_TLS_CERTDIR: ""
-  #DOCKER_TLS_CERTDIR: "/certs"
-  #DOCKER_HOST: tcp://docker:2375
-  #DOCKER_TLS_CERTDIR: ""
 
 before_script:
   - echo "${DOCKER_TOKEN}" | docker login --username "${DOCKER_USER}" --password-stdin
 
 stages:
-   - opencl
+   - deploy
 
-.opencl_template: &opencl_definition
-    stage: opencl
+amdgpu:
+    stage: deploy
     script:
       - if [ $CI_COMMIT_REF_NAME == "develop" ]; then
           REV="git";
@@ -28,17 +23,11 @@ stages:
         else
           REV="$CI_COMMIT_REF_NAME";
         fi
-      - docker pull "${REPOSITORY}-nvidia:${REV}" || true
-      - docker build --network=host --pull -t "${REPOSITORY}-nvidia:${REV}"
-                     --cache-from "${REPOSITORY}-nvidia:${REV}"
-                     --build-arg "aparapiver=${VERSION}"
-                     "nvidia/"
       - docker pull "${REPOSITORY}-amdgpu:${REV}" || true
       - docker build --network=host --pull -t "${REPOSITORY}-amdgpu:${REV}"
                      --cache-from "${REPOSITORY}-amdgpu:${REV}"
                      --build-arg "aparapiver=${VERSION}"
                      "amdgpu/"
-      - docker push "${REPOSITORY}-nvidia"
       - docker push "${REPOSITORY}-amdgpu"
     only:
       - master
@@ -47,5 +36,25 @@ stages:
     tags:
       - dind
 
-opencl:
-    <<: *opencl_definition
+amdgpu:
+    stage: deploy
+    script:
+      - if [ $CI_COMMIT_REF_NAME == "develop" ]; then
+          REV="git";
+        elif [ $CI_COMMIT_REF_NAME == "master" ]; then
+          REV="latest";
+        else
+          REV="$CI_COMMIT_REF_NAME";
+        fi
+      - docker pull "${REPOSITORY}-nvidia:${REV}" || true
+      - docker build --network=host --pull -t "${REPOSITORY}-nvidia:${REV}"
+                     --cache-from "${REPOSITORY}-nvidia:${REV}"
+                     --build-arg "aparapiver=${VERSION}"
+                     "nvidia/"
+      - docker push "${REPOSITORY}-nvidia"
+    only:
+      - master
+      - develop
+      - tags
+    tags:
+      - dind