diff --git a/scripts/devenv-builder/configure-composer.sh b/scripts/devenv-builder/configure-composer.sh
index af5af70544..73c849a530 100755
--- a/scripts/devenv-builder/configure-composer.sh
+++ b/scripts/devenv-builder/configure-composer.sh
@@ -1,86 +1,153 @@
 #!/bin/bash
-set -exo pipefail
+set -euxo pipefail
 
 SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DNF_RETRY="${SCRIPTDIR}/../dnf_retry.sh"
 
-# Necessary for embedding container images
-if [ ! -e /etc/osbuild-worker/pull-secret.json ] ; then
-    sudo mkdir -p /etc/osbuild-worker
-    sudo ln -s /etc/crio/openshift-pull-secret /etc/osbuild-worker/pull-secret.json
-    sudo tee /etc/osbuild-worker/osbuild-worker.toml &>/dev/null <<EOF
+install_and_configure_composer() {
+    local -r version_id=$1
+    local -r version_id_major="$(awk -F. '{print $1}' <<< "${version_id}")"
+
+    "${DNF_RETRY}" "install" \
+        "osbuild osbuild-composer \
+        git composer-cli ostree rpm-ostree \
+        cockpit-composer bash-completion podman runc genisoimage \
+        createrepo yum-utils selinux-policy-devel jq wget lorax rpm-build \
+        containernetworking-plugins expect httpd-tools vim-common"
+
+    # The mock utility comes from the EPEL repository
+    "${DNF_RETRY}" "install" "https://dl.fedoraproject.org/pub/epel/epel-release-latest-${version_id_major}.noarch.rpm"
+    "${DNF_RETRY}" "install" "mock nginx tomcli parallel aria2"
+    sudo usermod -a -G mock "$(whoami)"
+
+    # Necessary for embedding container images
+    if [ ! -e /etc/osbuild-worker/pull-secret.json ] ; then
+        sudo mkdir -p /etc/osbuild-worker
+        sudo ln -sf /etc/crio/openshift-pull-secret /etc/osbuild-worker/pull-secret.json
+        sudo tee /etc/osbuild-worker/osbuild-worker.toml &>/dev/null <<EOF
 [containers]
 auth_file_path = "/etc/osbuild-worker/pull-secret.json"
 EOF
-fi
+    fi
+}
+
+enable_or_restart_composer_services() {
+    local -r composer_active=$(sudo systemctl is-active osbuild-composer.service || true)
+
+    sudo systemctl enable osbuild-composer.socket --now
+    if [[ "${composer_active}" == "active" ]]; then
+        # If composer was active before, restart it to make kernel-rt repository configuration active
+        sudo systemctl restart osbuild-composer.service
+    fi
+    sudo systemctl enable cockpit.socket --now
+    sudo firewall-cmd --add-service=cockpit --permanent
+}
+
+check_umask_and_permissions() {
+    # Verify umask and home directory permissions
+    local -r test_file=$(mktemp /tmp/configure-perm-test.XXXXX)
+
+    touch "${test_file}.file"
+    mkdir "${test_file}.dir"
+    local -r home_perm=$(stat -c 0%a ~)
+    local -r file_perm=$(stat -c 0%a "${test_file}.file")
+    local -r dir_perm=$(stat -c 0%a "${test_file}.dir")
+
+    # Set the correct permissions for osbuild-composer
+    [ "${home_perm}" -lt 0711 ]  && chmod go+x ~
+
+    if [ "${file_perm}" -lt 0644 ] || [ "${dir_perm}" -lt 0711 ] ; then
+        echo "Check ${test_file}.dir permissions. The umask setting must allow execute to group/others"
+        echo "Check ${test_file}.file permissions. The umask setting must allow read to group/others"
+        exit 1
+    fi
+
+    # Cleanup
+    rm -rf "${test_file}"*
+}
+
+enable_rt_repositories() {
+    local -r version_id=$1
+    local -r composer_config=$2
+
+    # Enable RT repository by duplicating the 'baseos' repository, changing its name,
+    # and replacing 'baseos' with 'rt'.
+    # Note that kernel-rt is only available for x86_64.
+    "${SCRIPTDIR}/../fetch_tools.sh" yq
+    sudo mkdir -p /etc/osbuild-composer/repositories/
+    "${SCRIPTDIR}/../../_output/bin/yq" \
+        '.["x86_64"] += (.["x86_64"][0] | .name = "kernel-rt" | .baseurl |= sub("baseos", "rt"))' \
+        "/usr/share/osbuild-composer/repositories/rhel-${version_id}.json" | jq | sudo tee "${composer_config}" >/dev/null
+}
+
+enable_beta_or_eus_repositories() {
+    local -r version_id=$1
+    local -r composer_config=$2
+
+    local -r version_id_major="$(awk -F. '{print $1}' <<< "${version_id}")"
+    local -r version_id_minor="$(awk -F. '{print $2}' <<< "${version_id}")"
+
+    local version_id_eus="dist"
+    if (( "${version_id_minor}" % 2 == 0 )) ; then
+        version_id_eus="eus"
+    fi
+
+    # The configuration will remain unchanged for non-beta and non-EUS operating systems.
+    if grep -qE "Red Hat Enterprise Linux.*Beta" /etc/redhat-release; then
+        sudo sed -i "s,dist/rhel${version_id_major}/${version_id},beta/rhel${version_id_major}/${version_id_major},g" "${composer_config}"
+    else
+        sudo sed -i "s,dist/rhel${version_id_major}/${version_id}/$(uname -m)/baseos/,${version_id_eus}/rhel${version_id_major}/${version_id}/$(uname -m)/baseos/,g" "${composer_config}"
+        sudo sed -i "s,dist/rhel${version_id_major}/${version_id}/$(uname -m)/appstream/,${version_id_eus}/rhel${version_id_major}/${version_id}/$(uname -m)/appstream/,g" "${composer_config}"
+    fi
+    # If the host OS is configured to use the internal repo, overwrite the composer configuration to match
+    if dnf repolist | grep -q download.eng.brq.redhat.com; then
+        # The gpgkey from /usr/share/osbuild-composer/repositories is valid and common for all repos
+        local -r gpgkey=$(ARCH=$(uname -m) jq '.[env.ARCH][] | select(.name=="baseos") | .gpgkey' /usr/share/osbuild-composer/repositories/rhel-"${version_id}".json)
+        sudo tee "${composer_config}" &>/dev/null <<EOF
+{
+  "$(uname -m)": [
+    {
+      "name": "baseos",
+      "baseurl": "http://download.eng.brq.redhat.com/rhel-${version_id_major}/nightly/RHEL-${version_id_major}/latest-RHEL-${version_id}/compose/BaseOS/$(uname -m)/os",
+      "gpgkey": ${gpgkey},
+      "rhsm": false,
+      "check_gpg": true
+    },
+    {
+      "name": "appstream",
+      "baseurl": "http://download.eng.brq.redhat.com/rhel-${version_id_major}/nightly/RHEL-${version_id_major}/latest-RHEL-${version_id}/compose/AppStream/$(uname -m)/os",
+      "gpgkey": ${gpgkey},
+      "rhsm": false,
+      "check_gpg": true
+    },
+    {
+      "name": "rt",
+      "baseurl": "http://download.eng.brq.redhat.com/rhel-${version_id_major}/nightly/RHEL-${version_id_major}/latest-RHEL-${version_id}/compose/RT/$(uname -m)/os",
+      "gpgkey": ${gpgkey},
+      "rhsm": false,
+      "check_gpg": true
+    }
+  ]
+}
+EOF
+    fi
+}
 
-"${DNF_RETRY}" "install" \
-     "osbuild osbuild-composer \
-     git composer-cli ostree rpm-ostree \
-     cockpit-composer bash-completion podman runc genisoimage \
-     createrepo yum-utils selinux-policy-devel jq wget lorax rpm-build \
-     containernetworking-plugins expect httpd-tools"
+#
+# Main
+#
 
-# Parse the OS versions and determine if EUS
+# Read the current OS version (i.e. VERSION_ID)
 source /etc/os-release
-VERSION_ID_MAJOR="$(awk -F. '{print $1}' <<< "${VERSION_ID}")"
-VERSION_ID_MINOR="$(awk -F. '{print $2}' <<< "${VERSION_ID}")"
-VERSION_ID_EUS="dist"
-if (( "${VERSION_ID_MINOR}" % 2 == 0 )) ; then
-    VERSION_ID_EUS="eus"
-fi
-
-# Edit composer configuration file for the current operating system
-COMPOSER_CONFIG="/etc/osbuild-composer/repositories/rhel-${VERSION_ID}.json"
-
-# Enable RT repository by duplicating the 'baseos' repository, changing its name,
-# and replacing 'baseos' with 'rt'.
-# Note that kernel-rt is only available for x86_64.
-"${SCRIPTDIR}/../fetch_tools.sh" yq
-sudo mkdir -p /etc/osbuild-composer/repositories/
-"${SCRIPTDIR}/../../_output/bin/yq" \
-    '.["x86_64"] += (.["x86_64"][0] | .name = "kernel-rt" | .baseurl |= sub("baseos", "rt"))' \
-    "/usr/share/osbuild-composer/repositories/rhel-${VERSION_ID}.json" | jq | sudo tee "${COMPOSER_CONFIG}" >/dev/null
-
-# Enable beta or EUS repositories.
-# The configuration will remain unchanged for non-beta and non-EUS operating systems.
-if grep -qE "Red Hat Enterprise Linux.*Beta" /etc/redhat-release; then
-    sudo sed -i "s,dist/rhel${VERSION_ID_MAJOR}/${VERSION_ID},beta/rhel${VERSION_ID_MAJOR}/${VERSION_ID_MAJOR},g" "${COMPOSER_CONFIG}"
-else
-    sudo sed -i "s,dist/rhel${VERSION_ID_MAJOR}/${VERSION_ID}/$(uname -m)/baseos/,${VERSION_ID_EUS}/rhel${VERSION_ID_MAJOR}/${VERSION_ID}/$(uname -m)/baseos/,g" "${COMPOSER_CONFIG}"
-    sudo sed -i "s,dist/rhel${VERSION_ID_MAJOR}/${VERSION_ID}/$(uname -m)/appstream/,${VERSION_ID_EUS}/rhel${VERSION_ID_MAJOR}/${VERSION_ID}/$(uname -m)/appstream/,g" "${COMPOSER_CONFIG}"
-fi
-
-composer_active=$(sudo systemctl is-active osbuild-composer.service || true)
-sudo systemctl enable osbuild-composer.socket --now
-if [[ "${composer_active}" == "active" ]]; then
-    # If composer was active before, restart it to make kernel-rt repository configuration active.
-    sudo systemctl restart osbuild-composer.service
-fi
-sudo systemctl enable cockpit.socket --now
-sudo firewall-cmd --add-service=cockpit --permanent
-
-# The mock utility comes from the EPEL repository
-"${DNF_RETRY}" "install" "https://dl.fedoraproject.org/pub/epel/epel-release-latest-${VERSION_ID_MAJOR}.noarch.rpm"
-"${DNF_RETRY}" "install" "mock nginx tomcli parallel aria2"
-sudo usermod -a -G mock "$(whoami)"
-
-# Verify umask and home directory permissions
-TEST_FILE=$(mktemp /tmp/configure-perm-test.XXXXX)
-
-touch "${TEST_FILE}.file"
-mkdir "${TEST_FILE}.dir"
-HOME_PERM=$(stat -c 0%a ~)
-FILE_PERM=$(stat -c 0%a "${TEST_FILE}.file")
-DIR_PERM=$(stat -c 0%a "${TEST_FILE}.dir")
-
-# Set the Correct Permissions for osbuild-composer
-[ "${HOME_PERM}" -lt 0711 ]  && chmod go+x ~
-
-if [ "${FILE_PERM}" -lt 0644 ] || [ "${DIR_PERM}" -lt 0711 ] ; then
-    echo "Check ${TEST_FILE}.dir permissions. The umask setting must allow execute to group/others"
-    echo "Check ${TEST_FILE}.file permissions. The umask setting must allow read to group/others"
-    exit 1
-fi
-
-rm -rf "${TEST_FILE}"*
+
+# shellcheck disable=SC2153
+install_and_configure_composer "${VERSION_ID}"
+check_umask_and_permissions
+
+# Configure repositories for the current OS
+enable_rt_repositories          "${VERSION_ID}" "/etc/osbuild-composer/repositories/rhel-${VERSION_ID}.json"
+enable_beta_or_eus_repositories "${VERSION_ID}" "/etc/osbuild-composer/repositories/rhel-${VERSION_ID}.json"
+
+# This step must come in the end to make sure all the potential configuration
+# changes are picked up by the service
+enable_or_restart_composer_services