diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 008923d8fcfedd6fec2c0ea829229a89c1bb49ae..8ef91aeff7fd092dfc32c89362abc0c59a64b880 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,18 +3,33 @@ services:
     - docker:dind
 
 variables:
-    LATEST_VER: "registry.gitlab.com/synchrotron-soleil/control-system/containers/dev-el6:latest"
+    NAME: dev-el6
+    CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
+    CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
 
 stages:
     - build
+    - test
+    - release
 
 build-job:
     stage: build
-#    only:
-#        - master
     before_script:
-        - echo "$REGISTRY_PASSWORD" | docker login registry.gitlab.com -u "$REGISTRY_USER" --password-stdin
+        - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
     script:
-        - docker info
-        - docker build -t $LATEST_VER .
-        - docker push $LATEST_VER
+        - docker build --pull -t ${CONTAINER_TEST_IMAGE} .
+        - docker push ${CONTAINER_TEST_IMAGE}
+
+test:
+    stage: test
+    script:
+        - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
+        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
+        - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
+
+release:
+    stage: release
+    script:
+        - docker pull ${CONTAINER_TEST_IMAGE}
+        - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
+        - docker push ${CONTAINER_RELEASE_IMAGE}