diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 308b0947a96458515487669a040bc43bbd673745..80053f76085ede313ac40a533472e384a2bc9269 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,25 +63,14 @@ checkupdates_runner:
   script:
     # Get app IDs in this batch
     - |
-      metadata_files=(metadata/*.yml)
-      metadata_files_count=${#metadata_files[@]}
-      batch_size=$((metadata_files_count / CI_NODE_TOTAL + 1))
-      metadata_files_batch=("${metadata_files[@]:$(((CI_NODE_INDEX - 1) * batch_size)):$batch_size}")
-
-      declare -a CHECKUPDATES_APPIDS
-      for file in "${metadata_files_batch[@]}"; do
-        filename="${file##*/}"
-        filename_without_extension="${filename%.*}"
-        CHECKUPDATES_APPIDS=("${CHECKUPDATES_APPIDS[@]}" "$filename_without_extension")
-      done
-
-      export CHECKUPDATES_APPIDS
+      appids=($(grep -PL '^UpdateCheckMode: (None|Static)' metadata/*yml | grep -oP '(?<=metadata/).*(?=.yml)'))
+      appids_count=${#appids[@]}
+      batch_size=$((appids_count / CI_NODE_TOTAL + 1))
+      CHECKUPDATES_APPIDS=("${appids[@]:$(((CI_NODE_INDEX - 1) * batch_size)):$batch_size}")
 
     - echo "$job_branch"
-    - echo "$metadata_files_count"
+    - echo "$appids_count"
     - echo "$batch_size"
-    - echo "${metadata_files_batch[@]}"
-    - echo "${#metadata_files_batch[@]}"
     - echo "${CHECKUPDATES_APPIDS[@]}"
     - echo "${#CHECKUPDATES_APPIDS[@]}"