diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f6f7a2d7feca7c431396dfe29730afaa24333a1..01b857f8c772e2abce05acd51a5da9323f04e6e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,17 +26,6 @@ build:
     - python3 setup.py install
 
 
-build_singularity_image:
-  stage: build
-
-  artifacts:
-    paths:
-      - Containers/VirtualFluidsOpenMPI.sif
-
-  script:
-    - singularity build Containers/VirtualFluidsOpenMPI.sif Containers/VirtualFluidsOpenMPI.def
-
-
 virtual_fluids_basics_test:
   stage: test
 
@@ -63,16 +52,37 @@ test_python_bindings:
     - python3 -m unittest discover -s Python -v
 
 
+build_singularity_image:
+  stage: release
+  rules:
+    - if: $CI_COMMIT_TAG
+
+  artifacts:
+    paths:
+      - Containers/VirtualFluidsOpenMPI.sif
+
+  script:
+    - singularity build Containers/VirtualFluidsOpenMPI.sif Containers/VirtualFluidsOpenMPI.def
+
 create_release:
   image: registry.gitlab.com/gitlab-org/release-cli:latest
   stage: release
+  needs: "build_singularity_image"
   rules:
     - if: $CI_COMMIT_TAG
 
   script:
     - echo "Creating release with tag $CI_COMMIT_TAG"
-
-  release:
-    tag_name: $CI_COMMIT_TAG
-    name: "VirtualFluids $CI_COMMIT_TAG"
-    description: "VirtualFluids CFD Simulator"
+    - release-cli create --name "VirtualFluids $CI_COMMIT_TAG" \
+      --description "VirtualFluids CFD Simulator" \
+      --tag-name "$CI_COMMIT_TAG" \
+      --ref "$CI_COMMIT_SHA" \
+      --job-token "$CI_JOB_TOKEN" \
+      --assets-link='{"name": "VirtualFluidsSingularityImage_OpenMPI", "url":"", "type": "other", "filepath": "Containers/VirtualFluidsOpenMPI.sif" }'
+
+  #release:
+  #  tag_name: $CI_COMMIT_TAG
+  #  name: "VirtualFluids $CI_COMMIT_TAG"
+  #  description: "VirtualFluids CFD Simulator"
+
+