diff --git a/cicd/gitlab/gitlab-ci.yml b/cicd/gitlab/gitlab-ci.yml
index 86c29823f2ec12223c107c377ac01db4255097fc..30b4c8e8a15df13f56610a68cd7531dfb643e118 100644
--- a/cicd/gitlab/gitlab-ci.yml
+++ b/cicd/gitlab/gitlab-ci.yml
@@ -16,11 +16,7 @@ variables:
       - 3.1.14
     description: "Emscripten SDK version"
   DEBIAN_FRONTEND: non-interactive
-  QDS_CI_PACKAGE_NAME: "qtdvs-${QDS_CI_BUILD_QT_VERSION}"
-  QDS_CI_CACHE_KEY_BUILD: "cache-build-${CI_PIPELINE_ID}"
-  QDS_CI_CACHE_KEY_PROD: "cache-prod-${CI_PIPELINE_ID}"
-  QDS_CI_CACHE_PATH_BUILD: "${CI_PROJECT_DIR}/outdir/build"
-  QDS_CI_CACHE_PATH_PROD: "${CI_PROJECT_DIR}/outdir/prod"
+  QDS_ARTIFACTS_PATH: "${CI_PROJECT_DIR}/outdir/artifacts"
   GIT_SUBMODULE_STRATEGY: recursive
 
 stages:
diff --git a/cicd/gitlab/stages/build.yml b/cicd/gitlab/stages/build.yml
index d4e51cd6a2715f389b7d86131b317c44ee86a8f2..1430096d972966c8d5fff8ddffcb6e3a1ed827d1 100644
--- a/cicd/gitlab/stages/build.yml
+++ b/cicd/gitlab/stages/build.yml
@@ -6,7 +6,6 @@
     - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web"
   variables:
     QDS_BUILD_PATH: "${CI_PROJECT_DIR}/outdir/build"
-    QDS_ARTIFACTS_PATH: "${CI_PROJECT_DIR}/outdir/artifacts"
   artifacts:
     name: design-viewer-${QDS_CI_OS}-${CI_JOB_ID}
     expose_as: "build-artifacts"
diff --git a/cicd/gitlab/stages/deploy.yml b/cicd/gitlab/stages/deploy.yml
deleted file mode 100644
index a906a70e5133c5d6c2069e2ff57a7ab0e1dfecf1..0000000000000000000000000000000000000000
--- a/cicd/gitlab/stages/deploy.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-deploy-android:
-  stage: deploy
-  image: "alpine:latest"
-  tags:
-    - linux-blade
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web"
-  script:
-    - echo "Deploying to Android"
diff --git a/cicd/gitlab/stages/release.yml b/cicd/gitlab/stages/release.yml
index 4175bc3693ef565a0303e5ebe2a622ae80f5f32a..8320de4e3eacb01f2770fd5e6634e4c11b2ff0e1 100644
--- a/cicd/gitlab/stages/release.yml
+++ b/cicd/gitlab/stages/release.yml
@@ -1,9 +1,28 @@
-release-android:
+.release-common:
   stage: release
-  image: "alpine:latest"
   tags:
     - linux-blade
   rules:
-    - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web"
+    - if: $CI_COMMIT_TAG
+  release:
+    name: ${QDS_RELEASE_NAME}
+    description: ${QDS_RELEASE_DESCRIPTION}
+    tag_name: '$CI_COMMIT_TAG'
+
+release-android:
+  extends: .release-common
+  variables:
+    QDS_RELEASE_NAME: "Design Viewer Android - ${CI_COMMIT_TAG}"
+    QDS_RELEASE_DESCRIPTION: "This version is built on ${QDS_CI_BUILD_QT_VERSION_ANDROID}"
+  image: "alpine:latest"
+  script:
+    - echo "Releasing Design Viewer Android application"
+
+release-wasm-singlethread:
+  extends: .release-common
+  variables:
+    QDS_RELEASE_NAME: "Design Viewer WASM - ${CI_COMMIT_TAG}"
+    QDS_RELEASE_DESCRIPTION: "This version is built on ${QDS_CI_BUILD_QT_VERSION_WASM}"
+  image: "alpine:latest"
   script:
-    - echo "Releasing Android artifacts"
+    - echo "Releasing Design Viewer WebAssembly application"