diff --git a/checkbox-core-snap/common_files/config/wrapper_common b/checkbox-core-snap/common_files/config/wrapper_common
index a48f7a6f3..762414d14 100644
--- a/checkbox-core-snap/common_files/config/wrapper_common
+++ b/checkbox-core-snap/common_files/config/wrapper_common
@@ -31,6 +31,7 @@ else
   append_path PYTHONHOME $RUNTIME/usr
   append_path PYTHONPATH $RUNTIME/usr/lib/python3/dist-packages
   append_path PYTHONPATH $RUNTIME/lib/python3*/site-packages
+  append_path PYTHONPATH $RUNTIME/lib/python3*/dist-packages
 fi
 
 # make sure we always know where the content snap is especially for classic
diff --git a/checkbox-core-snap/common_files/config/wrapper_common_classic b/checkbox-core-snap/common_files/config/wrapper_common_classic
index 5144801a3..d64634bbf 100644
--- a/checkbox-core-snap/common_files/config/wrapper_common_classic
+++ b/checkbox-core-snap/common_files/config/wrapper_common_classic
@@ -42,6 +42,7 @@ else
   append_path PYTHONHOME $RUNTIME/usr
   append_path PYTHONPATH $RUNTIME/usr/lib/python3/dist-packages
   append_path PYTHONPATH $RUNTIME/lib/python3*/site-packages
+  append_path PYTHONPATH $RUNTIME/lib/python3*/dist-packages
 fi
 
 # make sure we always know where the content snap is especially for classic
diff --git a/checkbox-core-snap/series22/snap/snapcraft.yaml b/checkbox-core-snap/series22/snap/snapcraft.yaml
index 3e91b08bb..c66238ccd 100644
--- a/checkbox-core-snap/series22/snap/snapcraft.yaml
+++ b/checkbox-core-snap/series22/snap/snapcraft.yaml
@@ -330,7 +330,6 @@ parts:
       - python3-evdev
       - python3-gi
       - python3-natsort
-      - python3-opencv
       - python3-pil
       - python3-psutil
       - python3-pyqrcode
@@ -459,6 +458,51 @@ parts:
       python3 manage.py build
       python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-tutorial --root="$SNAPCRAFT_PART_INSTALL"
     after: [checkbox-provider-base]
+################################################################################
+  opencv:
+    plugin: make
+    source: https://github.com/opencv/opencv.git
+    source-tag: 4.9.0
+    override-build: |
+      cd $SNAPCRAFT_PART_SRC
+      mkdir build
+      cd build
+      cmake -DCMAKE_BUILD_TYPE=RELEASE \
+            -DCMAKE_INSTALL_PREFIX=$SNAPCRAFT_PART_INSTALL \
+            -DBUILD_LIST=videoio,features2d,highgui,flann,python3 ..
+      make -j$(nproc)
+      make install
+    build-packages:
+      - build-essential
+      - cmake
+      - pkg-config
+      - libjpeg-dev
+      - libpng-dev
+      - libtiff-dev
+      - libavcodec-dev
+      - libavformat-dev
+      - libswscale-dev
+      - libv4l-dev
+      - libxvidcore-dev
+      - libx264-dev
+      - libgtk-3-dev
+      - gfortran
+      - python3-dev
+      - python3-numpy
+    stage-packages:
+      - libjpeg8
+      - libpng16-16
+      - libtiff5
+      - libavcodec58
+      - libavformat58
+      - libfreetype6
+      - libswscale5
+      - libv4l-0
+      - libxvidcore4
+      - libx264-dev
+      - python3-minimal
+      - python3.10-minimal
+      - python3-numpy
 ################################################################################
   gnome-randr:
     source: https://github.com/maxwellainatchi/gnome-randr-rust.git