diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7ce4fd56..65b089a2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,9 +6,6 @@ on: [push, pull_request]
 #       - '*'
 
 env:
-  OPENCV2_VERSION: 2.4.13.7
-  OPENCV3_VERSION: 3.4.20
-  OPENCV4_VERSION: 4.8.1
   DEVELOPER_DIR: /Applications/Xcode_13.4.1.app/Contents/Developer
   IOS_DEPLOYMENT_TARGET: '9.0'
   MAC_DEPLOYMENT_TARGET: '10.9'
@@ -32,46 +29,50 @@ jobs:
       id: get_version
       run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
     - name: opencv2-source
+      env:
+        opencv-version: 2.4.13.7
       run: |
-        wget -q https://github.com/opencv/opencv/archive/$OPENCV2_VERSION.zip -O opencv-$OPENCV2_VERSION.zip
-        unzip -q opencv-$OPENCV2_VERSION.zip
-        rm opencv-$OPENCV2_VERSION.zip
-        cd opencv-$OPENCV2_VERSION
+        wget -q https://github.com/opencv/opencv/archive/${{ env.opencv-version }}.zip -O opencv-${{ env.opencv-version }}.zip
+        unzip -q opencv-${{ env.opencv-version }}.zip
+        rm opencv-${{ env.opencv-version }}.zip
+        cd opencv-${{ env.opencv-version }}
         truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
-        patch -p1 -i ../patches/opencv-$OPENCV2_VERSION-no-rtti.patch
-        patch -p1 -i ../patches/opencv-$OPENCV2_VERSION-no-zlib.patch
-        patch -p1 -i ../patches/opencv-$OPENCV2_VERSION-fix-highgui-include.patch
-        patch -p1 -i ../patches/opencv-$OPENCV2_VERSION-no-link-stdc++.patch
-        patch -p1 -i ../patches/opencv-$OPENCV2_VERSION-enable-cxx11.patch
-        patch -p1 -i ../patches/opencv-$OPENCV2_VERSION-link-openmp.patch
-        patch -p1 -i ../patches/opencv-$OPENCV2_VERSION-newer-msvc.patch
-        patch -p1 -i ../patches/opencv-$OPENCV2_VERSION-minimal-install.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-rtti.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-zlib.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-highgui-include.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-link-stdc++.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-enable-cxx11.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-link-openmp.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-newer-msvc.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
         cp ../patches/draw_text.h ../patches/mono_font_data.h modules/core/src/
-        patch -p1 -i ../patches/opencv-$OPENCV2_VERSION-drawing-mono-font.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
         rm -rf modules/highgui
         cp -r ../highgui modules/
         rm -rf 3rdparty apps data doc samples platforms
         rm -rf modules/java
         rm -rf modules/python
         rm -rf modules/ts
-        sed -e 's/__VERSION__/$OPENCV2_VERSION/g' ../patches/Info.plist > ./Info.plist
+        sed -e 's/__VERSION__/${{ env.opencv-version }}/g' ../patches/Info.plist > ./Info.plist
         cp ../opencv2_cmake_options.txt ./options.txt
         cd ..
-        mv opencv-$OPENCV2_VERSION opencv-mobile-$OPENCV2_VERSION
-        zip -9 -r opencv-mobile-$OPENCV2_VERSION.zip opencv-mobile-$OPENCV2_VERSION
+        mv opencv-${{ env.opencv-version }} opencv-mobile-${{ env.opencv-version }}
+        zip -9 -r opencv-mobile-${{ env.opencv-version }}.zip opencv-mobile-${{ env.opencv-version }}
     - name: opencv3-source
+      env:
+        opencv-version: 3.4.20
       run: |
-        wget -q https://github.com/opencv/opencv/archive/$OPENCV3_VERSION.zip -O opencv-$OPENCV3_VERSION.zip
-        unzip -q opencv-$OPENCV3_VERSION.zip
-        rm opencv-$OPENCV3_VERSION.zip
-        cd opencv-$OPENCV3_VERSION
+        wget -q https://github.com/opencv/opencv/archive/${{ env.opencv-version }}.zip -O opencv-${{ env.opencv-version }}.zip
+        unzip -q opencv-${{ env.opencv-version }}.zip
+        rm opencv-${{ env.opencv-version }}.zip
+        cd opencv-${{ env.opencv-version }}
         truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
-        patch -p1 -i ../patches/opencv-$OPENCV3_VERSION-no-rtti.patch
-        patch -p1 -i ../patches/opencv-$OPENCV3_VERSION-no-zlib.patch
-        patch -p1 -i ../patches/opencv-$OPENCV3_VERSION-link-openmp.patch
-        patch -p1 -i ../patches/opencv-$OPENCV3_VERSION-minimal-install.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-rtti.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-zlib.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-link-openmp.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
         cp ../patches/draw_text.h ../patches/mono_font_data.h modules/imgproc/src/
-        patch -p1 -i ../patches/opencv-$OPENCV3_VERSION-drawing-mono-font.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
         rm -rf modules/highgui
         cp -r ../highgui modules/
         rm -rf 3rdparty apps data doc samples platforms
@@ -79,25 +80,27 @@ jobs:
         rm -rf modules/js
         rm -rf modules/python
         rm -rf modules/ts
-        sed -e 's/__VERSION__/$OPENCV3_VERSION/g' ../patches/Info.plist > ./Info.plist
+        sed -e 's/__VERSION__/${{ env.opencv-version }}/g' ../patches/Info.plist > ./Info.plist
         cp ../opencv3_cmake_options.txt ./options.txt
         cd ..
-        mv opencv-$OPENCV3_VERSION opencv-mobile-$OPENCV3_VERSION
-        zip -9 -r opencv-mobile-$OPENCV3_VERSION.zip opencv-mobile-$OPENCV3_VERSION
+        mv opencv-${{ env.opencv-version }} opencv-mobile-${{ env.opencv-version }}
+        zip -9 -r opencv-mobile-${{ env.opencv-version }}.zip opencv-mobile-${{ env.opencv-version }}
     - name: opencv4-source
+      env:
+        opencv-version: 4.8.1
       run: |
-        wget -q https://github.com/opencv/opencv/archive/$OPENCV4_VERSION.zip -O opencv-$OPENCV4_VERSION.zip
-        unzip -q opencv-$OPENCV4_VERSION.zip
-        rm opencv-$OPENCV4_VERSION.zip
-        cd opencv-$OPENCV4_VERSION
+        wget -q https://github.com/opencv/opencv/archive/${{ env.opencv-version }}.zip -O opencv-${{ env.opencv-version }}.zip
+        unzip -q opencv-${{ env.opencv-version }}.zip
+        rm opencv-${{ env.opencv-version }}.zip
+        cd opencv-${{ env.opencv-version }}
         truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
         rm -rf modules/gapi
-        patch -p1 -i ../patches/opencv-$OPENCV4_VERSION-no-rtti.patch
-        patch -p1 -i ../patches/opencv-$OPENCV4_VERSION-no-zlib.patch
-        patch -p1 -i ../patches/opencv-$OPENCV4_VERSION-link-openmp.patch
-        patch -p1 -i ../patches/opencv-$OPENCV4_VERSION-minimal-install.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-rtti.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-zlib.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-link-openmp.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
         cp ../patches/draw_text.h ../patches/mono_font_data.h modules/imgproc/src/
-        patch -p1 -i ../patches/opencv-$OPENCV4_VERSION-drawing-mono-font.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
         rm -rf modules/highgui
         cp -r ../highgui modules/
         rm -rf 3rdparty apps data doc samples platforms
@@ -105,126 +108,126 @@ jobs:
         rm -rf modules/js
         rm -rf modules/python
         rm -rf modules/ts
-        sed -e 's/__VERSION__/$OPENCV4_VERSION/g' ../patches/Info.plist > ./Info.plist
+        sed -e 's/__VERSION__/${{ env.opencv-version }}/g' ../patches/Info.plist > ./Info.plist
         cp ../opencv4_cmake_options.txt ./options.txt
         cd ..
-        mv opencv-$OPENCV4_VERSION opencv-mobile-$OPENCV4_VERSION
-        zip -9 -r opencv-mobile-$OPENCV4_VERSION.zip opencv-mobile-$OPENCV4_VERSION
+        mv opencv-${{ env.opencv-version }} opencv-mobile-${{ env.opencv-version }}
+        zip -9 -r opencv-mobile-${{ env.opencv-version }}.zip opencv-mobile-${{ env.opencv-version }}
     - name: upload-opencv2-source
       uses: actions/upload-artifact@v3
       with:
-        name: opencv-mobile-$OPENCV2_VERSION-source
-        path: opencv-mobile-$OPENCV2_VERSION.zip
+        name: opencv-mobile-2.4.13.7-source
+        path: opencv-mobile-2.4.13.7.zip
     - name: upload-opencv3-source
       uses: actions/upload-artifact@v3
       with:
-        name: opencv-mobile-$OPENCV3_VERSION-source
-        path: opencv-mobile-$OPENCV3_VERSION.zip
+        name: opencv-mobile-3.4.20-source
+        path: opencv-mobile-3.4.20.zip
     - name: upload-opencv4-source
       uses: actions/upload-artifact@v3
       with:
-        name: opencv-mobile-$OPENCV4_VERSION-source
-        path: opencv-mobile-$OPENCV4_VERSION.zip
+        name: opencv-mobile-4.8.1-source
+        path: opencv-mobile-4.8.1.zip
 
-  android:
-    needs: [setup]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        opencv-version: [$OPENCV2_VERSION, $OPENCV3_VERSION, $OPENCV4_VERSION]
-    env:
-      COMMON_CMAKE_OPTIONS: |
-        -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake \
-        -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False \
-        -DANDROID_PLATFORM=android-21 \
-        -DANDROID_CPP_FEATURES="no-rtti no-exceptions" \
-        -DCMAKE_INSTALL_PREFIX=install \
-        -DCMAKE_BUILD_TYPE=Release \
-    steps:
-    - uses: actions/checkout@v3
-    - name: ndk-fix-debug
-      run: sed -i -e '/^  -g$/d' $ANDROID_NDK_LATEST_HOME/build/cmake/android-legacy.toolchain.cmake
-    - uses: actions/download-artifact@v3
-      with:
-        name: opencv-mobile-${{ matrix.opencv-version }}-source
-    - name: setup-opencv-source
-      run: |
-        unzip -q opencv-mobile-${{ matrix.opencv-version }}.zip
-        echo "SOURCE_DIR=opencv-mobile-${{ matrix.opencv-version }}" >> $GITHUB_ENV
-        echo "PACKAGE_NAME=opencv-mobile-${{ matrix.opencv-version }}-android" >> $GITHUB_ENV
-    - name: build-armeabi-v7a
-      run: |
-        cd ${{ env.SOURCE_DIR }}
-        mkdir build-armeabi-v7a && cd build-armeabi-v7a
-        cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON \
-            `cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON ..
-        cmake --build . -j 2
-        cmake --build . --target install
-    - name: build-arm64-v8a
-      run: |
-        cd ${{ env.SOURCE_DIR }}
-        mkdir build-arm64-v8a && cd build-arm64-v8a
-        cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="arm64-v8a" \
-            `cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON -DOPENCV_EXTRA_FLAGS="-mno-outline-atomics" ..
-        cmake --build . -j 2
-        cmake --build . --target install
-    - name: build-x86
-      run: |
-        cd ${{ env.SOURCE_DIR }}
-        mkdir build-x86 && cd build-x86
-        cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="x86" \
-            `cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON ..
-        cmake --build . -j 2
-        cmake --build . --target install
-    - name: build-x86_64
-      run: |
-        cd ${{ env.SOURCE_DIR }}
-        mkdir build-x86_64 && cd build-x86_64
-        cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="x86_64" \
-            `cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON ..
-        cmake --build . -j 2
-        cmake --build . --target install
-    - name: package
-      run: |
-        mkdir ${{ env.PACKAGE_NAME }}
-        cp -rf ${{ env.SOURCE_DIR }}/build-x86/install/* ${{ env.PACKAGE_NAME }}/
-        cp -rf ${{ env.SOURCE_DIR }}/build-x86_64/install/* ${{ env.PACKAGE_NAME }}/
-        cp -rf ${{ env.SOURCE_DIR }}/build-armeabi-v7a/install/* ${{ env.PACKAGE_NAME }}/
-        cp -rf ${{ env.SOURCE_DIR }}/build-arm64-v8a/install/* ${{ env.PACKAGE_NAME }}/
-        zip -9 -r ${{ env.PACKAGE_NAME }}.zip ${{ env.PACKAGE_NAME }}
-    - name: test-armeabi-v7a
-      run: |
-        cd test
-        mkdir build-armeabi-v7a && cd build-armeabi-v7a
-        cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON \
-            -DOpenCV_DIR=$GITHUB_WORKSPACE/${{ env.PACKAGE_NAME }}/sdk/native/jni ..
-        cmake --build . -j 2
-    - name: test-arm64-v8a
-      run: |
-        cd test
-        mkdir build-arm64-v8a && cd build-arm64-v8a
-        cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="arm64-v8a" \
-            -DOpenCV_DIR=$GITHUB_WORKSPACE/${{ env.PACKAGE_NAME }}/sdk/native/jni ..
-        cmake --build . -j 2
-    - name: test-x86
-      run: |
-        cd test
-        mkdir build-x86 && cd build-x86
-        cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="x86" \
-            -DOpenCV_DIR=$GITHUB_WORKSPACE/${{ env.PACKAGE_NAME }}/sdk/native/jni ..
-        cmake --build . -j 2
-    - name: test-x86_64
-      run: |
-        cd test
-        mkdir build-x86_64 && cd build-x86_64
-        cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="x86_64" \
-            -DOpenCV_DIR=$GITHUB_WORKSPACE/${{ env.PACKAGE_NAME }}/sdk/native/jni ..
-        cmake --build . -j 2
-    - name: upload
-      uses: actions/upload-artifact@v3
-      with:
-        name: ${{ env.PACKAGE_NAME }}
-        path: ${{ env.PACKAGE_NAME }}.zip
+  # android:
+  #   needs: [setup]
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     matrix:
+  #       opencv-version: [2.4.13.7, 3.4.20, 4.8.1]
+  #   env:
+  #     COMMON_CMAKE_OPTIONS: |
+  #       -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake \
+  #       -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False \
+  #       -DANDROID_PLATFORM=android-21 \
+  #       -DANDROID_CPP_FEATURES="no-rtti no-exceptions" \
+  #       -DCMAKE_INSTALL_PREFIX=install \
+  #       -DCMAKE_BUILD_TYPE=Release \
+  #   steps:
+  #   - uses: actions/checkout@v3
+  #   - name: ndk-fix-debug
+  #     run: sed -i -e '/^  -g$/d' $ANDROID_NDK_LATEST_HOME/build/cmake/android-legacy.toolchain.cmake
+  #   - uses: actions/download-artifact@v3
+  #     with:
+  #       name: opencv-mobile-${{ matrix.opencv-version }}-source
+  #   - name: setup-opencv-source
+  #     run: |
+  #       unzip -q opencv-mobile-${{ matrix.opencv-version }}.zip
+  #       echo "SOURCE_DIR=opencv-mobile-${{ matrix.opencv-version }}" >> $GITHUB_ENV
+  #       echo "PACKAGE_NAME=opencv-mobile-${{ matrix.opencv-version }}-android" >> $GITHUB_ENV
+  #   - name: build-armeabi-v7a
+  #     run: |
+  #       cd ${{ env.SOURCE_DIR }}
+  #       mkdir build-armeabi-v7a && cd build-armeabi-v7a
+  #       cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON \
+  #           `cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON ..
+  #       cmake --build . -j 2
+  #       cmake --build . --target install
+  #   - name: build-arm64-v8a
+  #     run: |
+  #       cd ${{ env.SOURCE_DIR }}
+  #       mkdir build-arm64-v8a && cd build-arm64-v8a
+  #       cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="arm64-v8a" \
+  #           `cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON -DOPENCV_EXTRA_FLAGS="-mno-outline-atomics" ..
+  #       cmake --build . -j 2
+  #       cmake --build . --target install
+  #   - name: build-x86
+  #     run: |
+  #       cd ${{ env.SOURCE_DIR }}
+  #       mkdir build-x86 && cd build-x86
+  #       cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="x86" \
+  #           `cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON ..
+  #       cmake --build . -j 2
+  #       cmake --build . --target install
+  #   - name: build-x86_64
+  #     run: |
+  #       cd ${{ env.SOURCE_DIR }}
+  #       mkdir build-x86_64 && cd build-x86_64
+  #       cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="x86_64" \
+  #           `cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON ..
+  #       cmake --build . -j 2
+  #       cmake --build . --target install
+  #   - name: package
+  #     run: |
+  #       mkdir ${{ env.PACKAGE_NAME }}
+  #       cp -rf ${{ env.SOURCE_DIR }}/build-x86/install/* ${{ env.PACKAGE_NAME }}/
+  #       cp -rf ${{ env.SOURCE_DIR }}/build-x86_64/install/* ${{ env.PACKAGE_NAME }}/
+  #       cp -rf ${{ env.SOURCE_DIR }}/build-armeabi-v7a/install/* ${{ env.PACKAGE_NAME }}/
+  #       cp -rf ${{ env.SOURCE_DIR }}/build-arm64-v8a/install/* ${{ env.PACKAGE_NAME }}/
+  #       zip -9 -r ${{ env.PACKAGE_NAME }}.zip ${{ env.PACKAGE_NAME }}
+  #   - name: test-armeabi-v7a
+  #     run: |
+  #       cd test
+  #       mkdir build-armeabi-v7a && cd build-armeabi-v7a
+  #       cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON \
+  #           -DOpenCV_DIR=$GITHUB_WORKSPACE/${{ env.PACKAGE_NAME }}/sdk/native/jni ..
+  #       cmake --build . -j 2
+  #   - name: test-arm64-v8a
+  #     run: |
+  #       cd test
+  #       mkdir build-arm64-v8a && cd build-arm64-v8a
+  #       cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="arm64-v8a" \
+  #           -DOpenCV_DIR=$GITHUB_WORKSPACE/${{ env.PACKAGE_NAME }}/sdk/native/jni ..
+  #       cmake --build . -j 2
+  #   - name: test-x86
+  #     run: |
+  #       cd test
+  #       mkdir build-x86 && cd build-x86
+  #       cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="x86" \
+  #           -DOpenCV_DIR=$GITHUB_WORKSPACE/${{ env.PACKAGE_NAME }}/sdk/native/jni ..
+  #       cmake --build . -j 2
+  #   - name: test-x86_64
+  #     run: |
+  #       cd test
+  #       mkdir build-x86_64 && cd build-x86_64
+  #       cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="x86_64" \
+  #           -DOpenCV_DIR=$GITHUB_WORKSPACE/${{ env.PACKAGE_NAME }}/sdk/native/jni ..
+  #       cmake --build . -j 2
+  #   - name: upload
+  #     uses: actions/upload-artifact@v3
+  #     with:
+  #       name: ${{ env.PACKAGE_NAME }}
+  #       path: ${{ env.PACKAGE_NAME }}.zip
 
   ios:
     needs: [setup]
@@ -233,9 +236,9 @@ jobs:
       matrix:
         bitcode: [OFF, ON]
         include:
-          - { opencv-version: $OPENCV2_VERSION, opencv-header-dir: include/opencv2         }
-          - { opencv-version: $OPENCV3_VERSION, opencv-header-dir: include/opencv2         }
-          - { opencv-version: $OPENCV4_VERSION, opencv-header-dir: include/opencv4/opencv2 }
+          - { opencv-version: 2.4.13.7, opencv-header-dir: include/opencv2         }
+          - { opencv-version: 3.4.20,   opencv-header-dir: include/opencv2         }
+          - { opencv-version: 4.8.1,    opencv-header-dir: include/opencv4/opencv2 }
     env:
       COMMON_CMAKE_OPTIONS: |
         -DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
@@ -266,7 +269,7 @@ jobs:
         echo "SOURCE_DIR=opencv-mobile-${{ matrix.opencv-version }}" >> $GITHUB_ENV
         echo "PACKAGE_NAME=opencv-mobile-${{ matrix.opencv-version }}-ios-bitcode" >> $GITHUB_ENV
     - name: workaround-opencv2-list
-      if: matrix.opencv-version == '$OPENCV2_VERSION'
+      if: matrix.opencv-version == '2.4.13.7'
       run: |
         # workaround ar @list issue on macos
         sed -i -e 's!\\"${objpath4}\\"!${objpath4}!g' ${{ env.SOURCE_DIR }}/modules/world/CMakeLists.txt
@@ -335,9 +338,9 @@ jobs:
       matrix:
         bitcode: [OFF, ON]
         include:
-          - { opencv-version: $OPENCV2_VERSION, opencv-header-dir: include/opencv2         }
-          - { opencv-version: $OPENCV3_VERSION, opencv-header-dir: include/opencv2         }
-          - { opencv-version: $OPENCV4_VERSION, opencv-header-dir: include/opencv4/opencv2 }
+          - { opencv-version: 2.4.13.7, opencv-header-dir: include/opencv2         }
+          - { opencv-version: 3.4.20,   opencv-header-dir: include/opencv2         }
+          - { opencv-version: 4.8.1,    opencv-header-dir: include/opencv4/opencv2 }
     env:
       COMMON_CMAKE_OPTIONS: |
         -DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
@@ -368,7 +371,7 @@ jobs:
         echo "SOURCE_DIR=opencv-mobile-${{ matrix.opencv-version }}" >> $GITHUB_ENV
         echo "PACKAGE_NAME=opencv-mobile-${{ matrix.opencv-version }}-ios-simulator-bitcode" >> $GITHUB_ENV
     - name: workaround-opencv2-list
-      if: matrix.opencv-version == '$OPENCV2_VERSION'
+      if: matrix.opencv-version == '2.4.13.7'
       run: |
         # workaround ar @list issue on macos
         sed -i -e 's!\\"${objpath4}\\"!${objpath4}!g' ${{ env.SOURCE_DIR }}/modules/world/CMakeLists.txt
@@ -436,9 +439,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - { opencv-version: $OPENCV2_VERSION, opencv-dir: share/OpenCV      }
-          - { opencv-version: $OPENCV3_VERSION, opencv-dir: share/OpenCV      }
-          - { opencv-version: $OPENCV4_VERSION, opencv-dir: lib/cmake/opencv4 }
+          - { opencv-version: 2.4.13.7, opencv-dir: share/OpenCV      }
+          - { opencv-version: 3.4.20,   opencv-dir: share/OpenCV      }
+          - { opencv-version: 4.8.1,    opencv-dir: lib/cmake/opencv4 }
     env:
       COMMON_CMAKE_OPTIONS: |
         -DCMAKE_C_FLAGS="-fno-rtti -fno-exceptions" \