diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 906692c..b4a40a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,7 @@ stages:
 
 before_script:
   - echo -n $DOCKER_REGISTRY_TOKEN | docker login -u $DOCKER_REGISTRY_USER --password-stdin $DOCKER_REGISTRY
+  - echo -n $DOCKERHUB_REGISTRY_TOKEN | docker login -u $DOCKERHUB_REGISTRY_USER --password-stdin
 
 include: 'ci-templates/*.yml'
 
diff --git a/ci-templates/000_3.6.gitlab-ci.yml b/ci-templates/000_3.6.gitlab-ci.yml
index d26c565..70310c2 100644
--- a/ci-templates/000_3.6.gitlab-ci.yml
+++ b/ci-templates/000_3.6.gitlab-ci.yml
@@ -11,7 +11,7 @@ Build_36:
     - docker pull nest/nest-simulator:3.6 || true
     - docker build
         --cache-from nest/nest-simulator:3.6
-        --tag $DOCKER_REGISTRY_IMAGE:3.6
+        --tag nest/nest-simulator:3.6
         ./src/3.6
     # Simple test
     - docker run -i --rm nest/nest-simulator:3.6 bash /opt/test-nest.sh