diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 32977fdd39554808234af5343c880e08d2532c20..6e519ba518bdcad01dc2f989d607a388654c6120 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@ variables:
   PROJECT_ID: "83" # under Settings -> General
   APK_PATH: "app/build/outputs/apk/ose/release"
   UNSIGNED_APK: "davx5-ose-release-unsigned.apk"
-  DEV_APK: "Account-manager-dev.apk"
-  STABLE_APK: "Account-manager-stable.apk"
+  COMMUNITY_APK: "Account_manager_community.apk"
+  OFFICIAL_APK: "Account_manager_official.apk"
 
 stages:
   - update-from-upstream
   - build
-  - release
+  - gitlab_release
 
 before_script:
   - echo email.key=$PEPPER >> local.properties
@@ -49,20 +49,18 @@ build:
       - app/build/outputs/apk/ose/
 
 init_submodules:
-  stage: release
+  stage: gitlab_release
   rules:
     - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
       when: on_success
   script:
-    - |
-      git submodule add --force \
-      https://gitlab.e.foundation/e/os/system-apps-update-info.git systemAppsUpdateInfo
+    - git clone https://gitlab.e.foundation/e/os/system-apps-update-info.git systemAppsUpdateInfo
   artifacts:
     paths:
-      - systemAppsUpdateInfo/
+      - systemAppsUpdateInfo/scripts/
 
 generate-apks:
-  stage: release
+  stage: gitlab_release
   rules:
     - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
       when: on_success
@@ -77,15 +75,15 @@ generate-apks:
   script:
     - |
       ./systemAppsUpdateInfo/scripts/generate-apks.sh \
-      "$APK_PATH" "$UNSIGNED_APK" "$DEV_APK" "$STABLE_APK"
+      "$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK"
   artifacts:
     paths:
       - $APK_PATH/$UNSIGNED_APK
-      - $APK_PATH/$DEV_APK
-      - $APK_PATH/$STABLE_APK
+      - $APK_PATH/$COMMUNITY_APK
+      - $APK_PATH/$OFFICIAL_APK
 
 create-json-files:
-  stage: release
+  stage: gitlab_release
   dependencies:
     - init_submodules
     - generate-apks
@@ -100,14 +98,14 @@ create-json-files:
   script:
     - |
       ./systemAppsUpdateInfo/scripts/create-json-files.sh \
-      "$APK_PATH" "$UNSIGNED_APK" "$DEV_APK" "$STABLE_APK"
+      "$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK"
   artifacts:
     paths:
-      - dev.json
-      - stable.json
+      - community.json
+      - official.json
 
 create-release:
-  stage: release
+  stage: gitlab_release
   dependencies:
     - init_submodules
   needs:
@@ -122,7 +120,7 @@ create-release:
   script:
     - |
       ./systemAppsUpdateInfo/scripts/create-release.sh \
-      "$APK_PATH" "$UNSIGNED_APK" "$DEV_APK" "$STABLE_APK"
+      "$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK"
 
 .update-from-upstream:
   stage: update-from-upstream