diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1600dda2ebb8df6868d8a1bad2121c4fc74c4b5..0f722eaf0425b3b1944af9000bc202c78eed67b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,20 +34,20 @@ deploy:
     - podman push "${image_name}/ubuntu"
     - calver="$(date -u +'%Y%m%dT%H%MZ')"
     - cuda_tag="cuda-10"
-    - podman tag "${image_name}/jupyterhub:${cuda_tag}" "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - podman push "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - podman image rm "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - docker pull "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - podman tag "${image_name}/jupyterhub_vim:${cuda_tag}" "${image_name}/jupyterhub_vim:$calver_${cuda_tag}"
+    - podman tag "${image_name}/jupyterhub:${cuda_tag}" "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - podman push "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - podman image rm "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - docker pull "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - podman tag "${image_name}/jupyterhub_vim:${cuda_tag}" "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - podman push "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - podman image rm "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - docker pull "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - cuda_tag="cuda-11"
-    - podman tag "${image_name}/jupyterhub:${cuda_tag}" "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - podman push "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - podman image rm "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - docker pull "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - podman tag "${image_name}/jupyterhub_vim:${cuda_tag}" "${image_name}/jupyterhub_vim:$calver_${cuda_tag}"
+    - podman tag "${image_name}/jupyterhub:${cuda_tag}" "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - podman push "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - podman image rm "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - docker pull "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - podman tag "${image_name}/jupyterhub_vim:${cuda_tag}" "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - podman push "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - podman image rm "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - docker pull "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"