diff --git a/.github/workflows/ios-check.yaml b/.github/workflows/ios-check.yaml
index 2ce9deb2d6..78305e7d40 100644
--- a/.github/workflows/ios-check.yaml
+++ b/.github/workflows/ios-check.yaml
@@ -25,6 +25,10 @@ jobs:
   ios-check:
     name: Build iOS Debug
     runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        buildType: [Debug, Release]
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
@@ -41,24 +45,13 @@ jobs:
         shell: bash
         # Check for compilation errors.
         run: |
-          # Run twice as a workaround for a dependency problem.
-          # https://github.com/organicmaps/organicmaps/issues/133
           xcodebuild \
             -workspace xcode/omim.xcworkspace \
             -scheme OMaps \
-            -configuration Debug build \
+            -configuration ${{ matrix.buildType }} build \
             'generic/platform=iOS' \
             CODE_SIGNING_REQUIRED=NO \
-            CODE_SIGNING_ALLOWED=NO \
-          |xcpretty || true
-          xcodebuild \
-            -workspace xcode/omim.xcworkspace \
-            -scheme OMaps \
-            -configuration Debug build \
-            'generic/platform=iOS' \
-            CODE_SIGNING_REQUIRED=NO \
-            CODE_SIGNING_ALLOWED=NO \
-          |xcpretty
+            CODE_SIGNING_ALLOWED=NO
 
   ios-check-metadata:
     name: Check app metadata
diff --git a/.github/workflows/linux-check.yaml b/.github/workflows/linux-check.yaml
index 7c9ee9ba24..44bdcc552a 100644
--- a/.github/workflows/linux-check.yaml
+++ b/.github/workflows/linux-check.yaml
@@ -18,14 +18,13 @@ on:
 
 jobs:
   linux-debug:
-    name: Linux Debug and Release Build and Test
+    name: Linux builds and tests
     runs-on: ubuntu-latest
-
     strategy:
       fail-fast: false
       matrix:
         compiler: [{ CXX: g++-10, CC: gcc-10 }, { CXX: clang++-12, CC: clang-12 }]
-        params: [{ CMAKE_BUILD_TYPE: Debug }, { CMAKE_BUILD_TYPE: Release }]
+        CMAKE_BUILD_TYPE: [Debug, RelWithDebInfo]
 
     steps:
       - name: Checkout sources
@@ -57,7 +56,7 @@ jobs:
         # -g1 should slightly reduce build time.
         run: |
           echo "Building ${{ matrix.params.CMAKE_BUILD_TYPE }}"
-          cmake . -B build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.params.CMAKE_BUILD_TYPE }} -DCMAKE_CXX_FLAGS_DEBUG=-g1
+          cmake . -B build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.CMAKE_BUILD_TYPE }} -DCMAKE_CXX_FLAGS=-g1
 
       - name: Compile
         shell: bash