diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7d4e6c558914d0bacce2297f1cf5d8ef456d00f..5f0f96a3c726323a9fd105c39671d38d8273f395 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ ubuntu:cpu-intel-user:docker-build:
   rules:
     - if: $CI_COMMIT_MESSAGE =~ /\[docker-build\]/
     - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_MESSAGE =~ /\[cpu-intel-user:docker-build:\]/
+    - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-cpu-intel-user\]/
 
 ubuntu:gpu-nvidia-user:docker-build:
   variables:
@@ -81,7 +81,7 @@ ubuntu:gpu-nvidia-user:docker-build:
   rules:
     - if: $CI_COMMIT_MESSAGE =~ /\[docker-build\]/
     - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_MESSAGE =~ /\[gpu-nvidia-user:docker-build\]/
+    - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-gpu-nvidia-user\]/
 
 ##############################
 ## CPU Intel                ##
diff --git a/ci/docker_images/ci_user/Dockerfile b/ci/docker_images/ci_user/Dockerfile
index a75a02ba065df389e137d58a6b14439a5dc8131e..79647cfad42fcc0c882b3d890114f7b03f670f60 100644
--- a/ci/docker_images/ci_user/Dockerfile
+++ b/ci/docker_images/ci_user/Dockerfile
@@ -199,10 +199,10 @@ RUN rm -rf pyFFTW
 FROM hysop-full-python AS hysop-final
 
 # Copy only necessary files from previous stages
-COPY --from=hptt /opt/conda/lib/*hptt* /opt/conda/lib
+COPY --from=hptt /opt/conda/lib/libhptt* /opt/conda/lib
 COPY --from=hptt /opt/conda/include /opt/conda/include
 COPY --from=flint /opt/conda/include/flint /opt/conda/include/flint
-COPY --from=flint /opt/conda/lib/*flint* /opt/conda/lib
+COPY --from=flint /opt/conda/lib/libflint* /opt/conda/lib
 # Copy only necessary parts of /opt/conda
 COPY --from=hptt /opt/conda/lib/python3.12/site-packages/hptt \
                  /opt/conda/lib/python3.12/site-packages/hptt