diff --git a/.gitignore b/.gitignore
index 7c04ea4..859d711 100644
--- a/.gitignore
+++ b/.gitignore
@@ -325,3 +325,4 @@
 /anaconda-34.25.2.1.tar.bz2
 /anaconda-34.25.2.2.tar.bz2
 /anaconda-34.25.2.3.tar.bz2
+/anaconda-34.25.2.4.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index e35564d..78ac2c8 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,6 +1,6 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 34.25.2.3
+Version: 34.25.2.4
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -35,12 +35,12 @@ Source0: %{name}-%{version}.tar.bz2
 %define libxklavierver 5.4
 %define mehver 0.23-1
 %define nmver 1.0
-%define pykickstartver 3.32.8-1
+%define pykickstartver 3.32.9-1
 %define pypartedver 2.5-2
 %define pythonblivetver 1:3.4.0-15
 %define rpmver 4.10.0
 %define simplelinever 1.8.3-1
-%define subscriptionmanagerver 1.29.24
+%define subscriptionmanagerver 1.29.31
 %define utillinuxver 2.15.1
 
 BuildRequires: audit-libs-devel
@@ -407,6 +407,24 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Tue Jan 03 2023 Jiri Konecny <jkonecny@redhat.com> - 34.25.2.4-1
+- Delegate auto-attach handling to RHSM (mkolman)
+  Resolves: rhbz#2083319
+- Use RHEL9_SshKeyData to fix sshkey quoting problem (bcl)
+  Resolves: rhbz#2149362
+- Test the InstallerStorage.copy method (vponcova)
+  Related: rhbz#2093793
+- Show multiple bootloader devices on the Manual Partitioning screen (vponcova)
+  Resolves: rhbz#2093793
+- Implement the Root.copy method (vponcova)
+  Related: rhbz#2093793
+- Redefine the Blivet.roots attribute (vponcova)
+  Related: rhbz#2093793
+- Redefine the Blivet.copy method (vponcova)
+  Related: rhbz#2093793
+- Use correct hint for VNC password boot option (jstodola)
+  Resolves: rhbz#2124818
+
 * Mon Nov 28 2022 Radek Vykydal <rvykydal@redhat.com> - 34.25.2.3-1
 - Disable the concurrency check in the error dialog in TUI (vponcova)
   Resolves: rhbz#2070920
diff --git a/sources b/sources
index b623126..28c362c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (anaconda-34.25.2.3.tar.bz2) = bf129e3b5df854c53f616d7b268f57b5cbcac8ccf8f4b639a21d645157522fa46419ea0ecb61168bbf383588ebaa631e725adfbe1fb0306390518e8d90517b31
+SHA512 (anaconda-34.25.2.4.tar.bz2) = 58230d3c8324c6745251dd06c8e220aacb459b3ae1a585c8927d4eaf821c9cacd16e35a80313a9935f23b7a2d33cb01b398b25ffc9b5d7d0711e60739eeb381b
diff --git a/tests/dirinstall/dirinstall.sh b/tests/dirinstall/dirinstall.sh
index 95a8f15..a75951d 100755
--- a/tests/dirinstall/dirinstall.sh
+++ b/tests/dirinstall/dirinstall.sh
@@ -9,14 +9,36 @@ WORK_DIR=$(mktemp -d /var/tmp/dirinstall.XXXXXX)
 # Create kickstart
 
 KICKSTART_PATH=${WORK_DIR}/ks.cfg
-source ./repositories
+. ./repositories
 TEST_KICKSTART=./ks.dirinstall.cfg
 
+echo "==== List of repositories ===="
+dnf repoinfo
+echo "== End list of repositories =="
+
+if grep -q 'NAME="CentOS Stream"' /etc/os-release ; then
+    BASE_REPO="$STREAM_BASE_REPO"
+    APP_REPO="$STREAM_APP_REPO"
+else
+    BASE_REPO="$RHEL_BASE_REPO"
+    APP_REPO="$RHEL_APP_REPO"
+fi
+
+get_base_url () {
+    REPO="$1"
+
+    # This will show repository content and get url from this:
+    # Repo-baseurl       : http://ftp.sh.cvut.cz/centos-stream/9-stream/BaseOS/x86_64/os/ (51 more)
+    dnf repoinfo "$REPO" | \
+        grep ^Repo-baseurl | \
+        cut -d: -f2- | \
+        sed 's/^ *//' | \
+        cut -d' ' -f1
+}
+
 # Dump URLs of installation repositories found in local repositories whose names are configured in 'repositories' file
-echo "url --url=$(dnf repoinfo $BASE_REPO | grep ^Repo-baseurl | cut -d: -f2- | sed 's/^ *//')" > ${KICKSTART_PATH}
-for repo in $REPOS; do
-    echo "repo --name=$repo --baseurl=$(dnf repoinfo $repo | grep ^Repo-baseurl | cut -d: -f2- | sed 's/^ *//')" >> ${KICKSTART_PATH}
-done
+echo "url --url=$(get_base_url $BASE_REPO)" > ${KICKSTART_PATH}
+echo "repo --name=$APP_REPO --baseurl=$(get_base_url $APP_REPO)" >> ${KICKSTART_PATH}
 
 cat ${TEST_KICKSTART} >> ${KICKSTART_PATH}
 
diff --git a/tests/dirinstall/repositories b/tests/dirinstall/repositories
index 5cc527f..b49ac23 100644
--- a/tests/dirinstall/repositories
+++ b/tests/dirinstall/repositories
@@ -1,4 +1,8 @@
 # Names of local repositories whose urls will be used for installation
 # Repositories for rhel in gating testing environment (vm image):
-BASE_REPO="rhel"
-REPOS="rhel-AppStream"
+RHEL_BASE_REPO="rhel"
+RHEL_APP_REPO="rhel-AppStream"
+
+# Repositories for CentOS Stream in gating testing environment:
+STREAM_BASE_REPO="baseos"
+STREAM_APP_REPO="appstream"