diff --git a/pungi.spec b/pungi.spec
index a26a4a75..03854cae 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -1,7 +1,7 @@
 %{?python_enable_dependency_generator}
 
 Name:           pungi
-Version:        4.2.17
+Version:        4.2.19
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -9,9 +9,7 @@ License:        GPLv2
 URL:            https://pagure.io/pungi
 Source0:        %{name}-%{version}.tar.bz2
 
-BuildRequires:  python3-nose
 BuildRequires:  python3-pytest
-BuildRequires:  python3-mock
 BuildRequires:  python3-pyfakefs
 BuildRequires:  python3-ddt
 BuildRequires:  python3-devel
@@ -39,7 +37,6 @@ BuildRequires:  python3-createrepo_c >= 0.20.1
 BuildRequires:  python3-dogpile-cache
 BuildRequires:  python3-parameterized
 BuildRequires:  python3-gobject-base
-BuildRequires:  python3-dataclasses
 
 #deps for doc building
 BuildRequires:  python3-sphinx
@@ -48,7 +45,6 @@ Requires:       python3-kobo-rpmlib >= 0.18.0
 Requires:       python3-productmd >= 1.33
 Requires:       python3-kickstart
 Requires:       python3-requests
-Requires:       python3-dataclasses
 Requires:       createrepo_c >= 0.20.1
 Requires:       koji >= 1.10.1-13
 Requires:       python3-koji-cli-plugins
@@ -160,14 +156,19 @@ python3 -m pytest
 
 
 %changelog
-
-* Wed Oct 19 2022 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.17-1
+* Wed Oct 19 2022 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.19-1
 - Replace list of cr.packages by cr.PackageIterator in package JSON generator
 - Do not lose a module from koji if we have more than one arch (e.g. x86_64 + i686)
 
-* Wed May 4 2022 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.16-1
+* Wed May 4 2022 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.18-1
 - ALBS-334: Make the ability of Pungi to give module_defaults from remote sources
 
+* Tue Mar 22 2022 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.17-1
+- ALBS-226: Patch pungi/lorax for building AL9
+
+* Thu Feb 25 2022 stepan_oksanichenio <soksanichenko@cloudlinux.com> - 4.2.16-1
+- ALBS-186: Move pungi to our gitea and build it for AL9
+
 * Thu Dec 30 2021 stepan_oksanichenio <soksanichenko@cloudlinux.com> - 4.2.15-1
 - ALBS-97: The scripts `gather_modules` and `generate_packages_json` support LZMA compression
 - ALBS-97: The script `generate_packages_json` can use repos with different architectures
diff --git a/setup.py b/setup.py
index 5dcf30b9..9d3c4470 100755
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ packages = sorted(packages)
 
 setup(
     name="pungi",
-    version="4.2.17",
+    version="4.2.19",
     description="Distribution compose tool",
     url="https://pagure.io/pungi",
     author="Dennis Gilmore",
diff --git a/tests/test_arch.py b/tests/test_arch.py
index 5112caea..fae515db 100644
--- a/tests/test_arch.py
+++ b/tests/test_arch.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import unittest
 
 from pungi.arch import (
diff --git a/tests/test_arguments.py b/tests/test_arguments.py
index 20bf17ed..42baacf4 100644
--- a/tests/test_arguments.py
+++ b/tests/test_arguments.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_checks.py b/tests/test_checks.py
index 788f727a..291b8445 100644
--- a/tests/test_checks.py
+++ b/tests/test_checks.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_compose.py b/tests/test_compose.py
index 85590273..1fdc7fef 100644
--- a/tests/test_compose.py
+++ b/tests/test_compose.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_config.py b/tests/test_config.py
index a3d8f92c..296895c6 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -7,7 +7,7 @@ except ImportError:
     import unittest
 
 import six
-import mock
+from unittest import mock
 
 from pungi import checks
 from tests.helpers import load_config, PKGSET_REPOS
diff --git a/tests/test_config_validate_script.py b/tests/test_config_validate_script.py
index 4f9c64bf..0933b441 100644
--- a/tests/test_config_validate_script.py
+++ b/tests/test_config_validate_script.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 import os
 import six
 
diff --git a/tests/test_createiso_phase.py b/tests/test_createiso_phase.py
index 48bf37b7..2451ddef 100644
--- a/tests/test_createiso_phase.py
+++ b/tests/test_createiso_phase.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 import six
 
 import os
diff --git a/tests/test_createiso_script.py b/tests/test_createiso_script.py
index 0db439cb..c16bc55a 100644
--- a/tests/test_createiso_script.py
+++ b/tests/test_createiso_script.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 from six.moves import StringIO
diff --git a/tests/test_createrepophase.py b/tests/test_createrepophase.py
index c0617e7f..197bb9f9 100644
--- a/tests/test_createrepophase.py
+++ b/tests/test_createrepophase.py
@@ -5,7 +5,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 import glob
 import os
diff --git a/tests/test_extra_files_phase.py b/tests/test_extra_files_phase.py
index 21dc3feb..1b85be04 100644
--- a/tests/test_extra_files_phase.py
+++ b/tests/test_extra_files_phase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 from productmd.extra_files import ExtraFiles
diff --git a/tests/test_gather_method_deps.py b/tests/test_gather_method_deps.py
index 77b30bcd..a231681d 100644
--- a/tests/test_gather_method_deps.py
+++ b/tests/test_gather_method_deps.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 from pungi.phases.gather.methods import method_deps as deps
 from tests import helpers
diff --git a/tests/test_gather_method_hybrid.py b/tests/test_gather_method_hybrid.py
index 80db2913..8c402095 100644
--- a/tests/test_gather_method_hybrid.py
+++ b/tests/test_gather_method_hybrid.py
@@ -2,7 +2,7 @@
 
 from collections import namedtuple
 import copy
-import mock
+from unittest import mock
 import os
 
 import six
diff --git a/tests/test_gather_method_nodeps.py b/tests/test_gather_method_nodeps.py
index b337fe96..02eafab1 100644
--- a/tests/test_gather_method_nodeps.py
+++ b/tests/test_gather_method_nodeps.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 import six
diff --git a/tests/test_gather_phase.py b/tests/test_gather_phase.py
index e120fea2..bcbea65b 100644
--- a/tests/test_gather_phase.py
+++ b/tests/test_gather_phase.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import copy
-import mock
+from unittest import mock
 import os
 
 try:
diff --git a/tests/test_gather_source_module.py b/tests/test_gather_source_module.py
index 7b87400a..a3482c3c 100644
--- a/tests/test_gather_source_module.py
+++ b/tests/test_gather_source_module.py
@@ -5,7 +5,7 @@ try:
 except ImportError:
     import unittest
 
-import mock
+from unittest import mock
 import six
 
 from pungi.phases.gather.sources.source_module import GatherSourceModule
diff --git a/tests/test_imagebuildphase.py b/tests/test_imagebuildphase.py
index 711e0f7d..28b43e77 100644
--- a/tests/test_imagebuildphase.py
+++ b/tests/test_imagebuildphase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import six
 
diff --git a/tests/test_imagechecksumphase.py b/tests/test_imagechecksumphase.py
index fd8a44cb..26930989 100644
--- a/tests/test_imagechecksumphase.py
+++ b/tests/test_imagechecksumphase.py
@@ -4,7 +4,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 import os
 import tempfile
diff --git a/tests/test_initphase.py b/tests/test_initphase.py
index afd2601e..af91d370 100644
--- a/tests/test_initphase.py
+++ b/tests/test_initphase.py
@@ -5,7 +5,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 import six
 
diff --git a/tests/test_iso_wrapper.py b/tests/test_iso_wrapper.py
index 5be0e32e..cfb45900 100644
--- a/tests/test_iso_wrapper.py
+++ b/tests/test_iso_wrapper.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import itertools
-import mock
+from unittest import mock
 import os
 import six
 
diff --git a/tests/test_koji_wrapper.py b/tests/test_koji_wrapper.py
index d14fe02a..2e6ec6c0 100644
--- a/tests/test_koji_wrapper.py
+++ b/tests/test_koji_wrapper.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import json
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_linker.py b/tests/test_linker.py
index e81ca2f2..93f1d4fe 100644
--- a/tests/test_linker.py
+++ b/tests/test_linker.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 import errno
 import os
 import stat
diff --git a/tests/test_liveimagesphase.py b/tests/test_liveimagesphase.py
index d459c9b9..8321a53e 100644
--- a/tests/test_liveimagesphase.py
+++ b/tests/test_liveimagesphase.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 
 import six
 
diff --git a/tests/test_livemediaphase.py b/tests/test_livemediaphase.py
index 7a2b878f..beffcb4d 100644
--- a/tests/test_livemediaphase.py
+++ b/tests/test_livemediaphase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 
diff --git a/tests/test_media_split.py b/tests/test_media_split.py
index f286f658..eba600df 100644
--- a/tests/test_media_split.py
+++ b/tests/test_media_split.py
@@ -4,7 +4,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 from pungi import media_split
 
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index a5fa10a2..8aa86df3 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import os
 
 import six
diff --git a/tests/test_notifier.py b/tests/test_notifier.py
index 445b6ff3..60a2aad7 100644
--- a/tests/test_notifier.py
+++ b/tests/test_notifier.py
@@ -2,7 +2,7 @@
 
 from datetime import datetime
 import json
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_orchestrator.py b/tests/test_orchestrator.py
index b26fcc67..05c640c1 100644
--- a/tests/test_orchestrator.py
+++ b/tests/test_orchestrator.py
@@ -9,7 +9,7 @@ import shutil
 import subprocess
 from textwrap import dedent
 
-import mock
+from unittest import mock
 import six
 from six.moves import configparser
 
diff --git a/tests/test_osbs_phase.py b/tests/test_osbs_phase.py
index 059ce828..fc6dd0a4 100644
--- a/tests/test_osbs_phase.py
+++ b/tests/test_osbs_phase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import json
 
 import copy
diff --git a/tests/test_osbuild_phase.py b/tests/test_osbuild_phase.py
index f3b70e61..f45de0cd 100644
--- a/tests/test_osbuild_phase.py
+++ b/tests/test_osbuild_phase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 
diff --git a/tests/test_ostree_installer_phase.py b/tests/test_ostree_installer_phase.py
index de705754..58dc4dac 100644
--- a/tests/test_ostree_installer_phase.py
+++ b/tests/test_ostree_installer_phase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 
diff --git a/tests/test_ostree_phase.py b/tests/test_ostree_phase.py
index b214a127..103b1315 100644
--- a/tests/test_ostree_phase.py
+++ b/tests/test_ostree_phase.py
@@ -2,7 +2,7 @@
 
 
 import json
-import mock
+from unittest import mock
 
 import os
 
diff --git a/tests/test_ostree_script.py b/tests/test_ostree_script.py
index c32ce466..e2b89b9f 100644
--- a/tests/test_ostree_script.py
+++ b/tests/test_ostree_script.py
@@ -4,7 +4,7 @@
 import json
 import os
 
-import mock
+from unittest import mock
 import six
 import yaml
 
diff --git a/tests/test_ostree_utils.py b/tests/test_ostree_utils.py
index 76541017..1fe03608 100644
--- a/tests/test_ostree_utils.py
+++ b/tests/test_ostree_utils.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 
diff --git a/tests/test_patch_iso.py b/tests/test_patch_iso.py
index 55abf12b..756e5452 100644
--- a/tests/test_patch_iso.py
+++ b/tests/test_patch_iso.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 try:
diff --git a/tests/test_phase_base.py b/tests/test_phase_base.py
index 5a45df39..15a7f2d9 100644
--- a/tests/test_phase_base.py
+++ b/tests/test_phase_base.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_pkgset_common.py b/tests/test_pkgset_common.py
index 455c7101..3038ba32 100755
--- a/tests/test_pkgset_common.py
+++ b/tests/test_pkgset_common.py
@@ -2,7 +2,7 @@
 
 import os
 
-import mock
+from unittest import mock
 import six
 
 from pungi.module_util import Modulemd
diff --git a/tests/test_pkgset_pkgsets.py b/tests/test_pkgset_pkgsets.py
index cc59f5bf..a5402e56 100644
--- a/tests/test_pkgset_pkgsets.py
+++ b/tests/test_pkgset_pkgsets.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import ddt as ddt
-import mock
+from unittest import mock
 import os
 import six
 
diff --git a/tests/test_repoclosure_phase.py b/tests/test_repoclosure_phase.py
index 81e4bb5b..bea7040e 100644
--- a/tests/test_repoclosure_phase.py
+++ b/tests/test_repoclosure_phase.py
@@ -6,7 +6,7 @@ try:
 except ImportError:
     import unittest
 
-import mock
+from unittest import mock
 import six
 
 import pungi.phases.repoclosure as repoclosure_phase
diff --git a/tests/test_runroot.py b/tests/test_runroot.py
index 95f4ca17..61b1567d 100644
--- a/tests/test_runroot.py
+++ b/tests/test_runroot.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 from pungi.runroot import Runroot
diff --git a/tests/test_scm.py b/tests/test_scm.py
index ae18985f..2be178af 100644
--- a/tests/test_scm.py
+++ b/tests/test_scm.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_test_phase.py b/tests/test_test_phase.py
index 486d8198..417f5cd0 100644
--- a/tests/test_test_phase.py
+++ b/tests/test_test_phase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 import pungi.phases.test as test_phase
diff --git a/tests/test_unified_isos.py b/tests/test_unified_isos.py
index 4047e5d5..82bd4865 100755
--- a/tests/test_unified_isos.py
+++ b/tests/test_unified_isos.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 import shutil
 import six
diff --git a/tests/test_util.py b/tests/test_util.py
index a5fc894d..db76ce66 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import argparse
-import mock
+from unittest import mock
 import os
 
 try: