diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0033b238396b612fcc7eaae8bdf6646c3a31cad..4aa98e6734e34b00c5394d3b335f2b0521da1e04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,11 +9,11 @@ build ubuntu-18.04:
     - echo "${CI_REGISTRY_PASSWORD}" | docker login -u "${CI_REGISTRY_USER}" "${CI_REGISTRY}" --password-stdin
   script:
     - GPU_DRIVER_VERSION="$(dpkg-query --showformat='${Version}' --show 'nvidia-driver-*')"
-    - CACHE_FILE="/var/lib/gitlab-runner/.local/share/rf_docker-gpu-driver-version"
+    - CACHE_FILE="/var/lib/gitlab-runner/.local/share/robofish-docker-gpu-driver-version"
     - if [[ -f $CACHE_FILE ]] && [[ "$(cat $CACHE_FILE)" == "$GPU_DRIVER_VERSION" ]]; then OPTS=''; else OPTS='--no-cache'; fi
     - echo -n $GPU_DRIVER_VERSION > $CACHE_FILE
-    - docker build $OPTS --pull -t "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:ubuntu-18.04" ubuntu-18.04
-    - docker push "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:ubuntu-18.04"
+    - docker build $OPTS --pull -t "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:cuda-devel-ubuntu18.04" -f ubuntu18.04/cuda-devel/Dockerfile ubuntu18.04
+    - docker push "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:cuda-devel-ubuntu18.04"
   after_script:
     - docker logout "${CI_REGISTRY}"
 
diff --git a/ubuntu18.04/Dockerfile b/ubuntu18.04/cuda-devel/Dockerfile
similarity index 100%
rename from ubuntu18.04/Dockerfile
rename to ubuntu18.04/cuda-devel/Dockerfile