diff --git a/autohck.sh b/autohck.sh
index b887036..fba4572 100644
--- a/autohck.sh
+++ b/autohck.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+RUBY_VERSION=3.3.7
+
 import_keys() {
   keys=( 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB )
   servers=( hkp://keyserver.ubuntu.com hkp://keys.openpgp.org )
@@ -62,7 +64,7 @@ install_ruby() {
   [ ! -f /etc/profile.d/rvm.sh ] || source /etc/profile.d/rvm.sh
   [ ! -f "${HOME}/.rvm/scripts/rvm" ] || source "${HOME}/.rvm/scripts/rvm"
 
-  rvm install 3.3.7
+  rvm install "${RUBY_VERSION}"
 
   gem update --system
 
@@ -116,6 +118,20 @@ post_clone_AUTOHCK() {
 
   if ! command_exists ruby; then
     install_ruby
+  else
+    result=$(ruby -e "puts Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('${RUBY_VERSION}')")
+    if [ "x${result}" != "xtrue" ]; then
+      log_warn "Ruby version is less than ${RUBY_VERSION}"
+      if command_exists rvm; then
+        log_info "Installing Ruby using rvm"
+        install_ruby
+      else
+        log_error "rvm command does not exist. AutoHCK Installer does not support installation of Ruby without rvm."
+        log_fatal "Please install Ruby version ${RUBY_VERSION} or greater manually."
+      fi
+    else
+      log_info "Ruby version is ${RUBY_VERSION} or greater"
+    fi
   fi
 
   commands_to_check=( slirp4netns ifconfig ethtool xorriso jq )
diff --git a/dependencies.sh b/dependencies.sh
index 8983a60..c2d45c0 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -3,7 +3,6 @@
 DEPENDENCIES=(
     VIRTIOFSD
     QEMU
-    HLK_SETUP_SCRIPTS
     EXTRA_SOFTWARE
     HLK_PLAYLISTS
     HCK_FILTERS
@@ -20,12 +19,8 @@ VIRTIOFSD_PACKAGE=TRUE
 # QEMU_DIR=
 QEMU_PACKAGE=TRUE
 
-HLK_SETUP_SCRIPTS_GIT=https://github.com/HCK-CI/HLK-Setup-Scripts.git
-HLK_SETUP_SCRIPTS_REF=61582b3b9cadd5199462c9866974a81112252e23
-# HLK_SETUP_SCRIPTS_DIR=
-
 EXTRA_SOFTWARE_GIT=https://github.com/HCK-CI/extra-software.git
-EXTRA_SOFTWARE_REF=6fc45774cc8513c77429e61f70af232ce9ed02ff
+EXTRA_SOFTWARE_REF=f92e66094fc142472c3b5d18c21aa7c74ad0dbc1
 # EXTRA_SOFTWARE_DIR=
 
 HLK_PLAYLISTS_GIT=https://github.com/HCK-CI/hlkplaylists.git
@@ -33,9 +28,9 @@ HLK_PLAYLISTS_REF=c36724811068a0e9cbf25470787f20794ada357c
 # HLK_PLAYLISTS_DIR=
 
 HCK_FILTERS_GIT=https://github.com/HCK-CI/hckfilters.git
-HCK_FILTERS_REF=fdfeaa2d0203ed67dc266aad4ff21948d38f39b7
+HCK_FILTERS_REF=364fa8ee26070e8a4904b27834aee49205ad6ab9
 # HCK_FILTERS_DIR=
 
 AUTOHCK_GIT=https://github.com/HCK-CI/AutoHCK.git
-AUTOHCK_REF=v0.17.7
+AUTOHCK_REF=v0.18.0
 # AUTOHCK_DIR=
diff --git a/qemu.sh b/qemu.sh
index baf286e..730a011 100644
--- a/qemu.sh
+++ b/qemu.sh
@@ -225,10 +225,10 @@ get_fw_config() {
       ;;
     centos|rhel|fedora)
       OVMF_CODE='/usr/share/edk2/ovmf-4m/OVMF_CODE.fd'
-      if [ ! -f "${OVMF_CODE}" ]; then OVMF_CODE='/usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2'; fi
+      if [ ! -f "${OVMF_CODE}" ]; then OVMF_CODE='/usr/share/edk2/ovmf/OVMF_CODE_4M.qcow2'; fi
 
       OVMF_CODE_SB='/usr/share/edk2/ovmf-4m/OVMF_CODE.secboot.fd'
-      if [ ! -f "${OVMF_CODE_SB}" ]; then OVMF_CODE_SB='/usr/share/edk2/ovmf/OVMF_CODE_4M.qcow2'; fi
+      if [ ! -f "${OVMF_CODE_SB}" ]; then OVMF_CODE_SB='/usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2'; fi
 
       OVMF_VARS_SB='/usr/share/edk2/ovmf-4m/OVMF_VARS.secboot.fd'
       if [ ! -f "${OVMF_VARS_SB}" ]; then OVMF_VARS_SB='/usr/share/edk2/ovmf/OVMF_VARS_4M.secboot.qcow2'; fi
diff --git a/tests/create_run_script.sh b/tests/create_run_script.sh
index 51135b3..93f3caf 100644
--- a/tests/create_run_script.sh
+++ b/tests/create_run_script.sh
@@ -55,5 +55,5 @@ echo xorriso -as mkisofs \
   -iso-level 4 -J -l -D -N \
   -joliet-long -relaxed-filenames -V "INSTALLER" \
   -old-exclude Kits \
-  '"${REPOS_DIR}/HLK-Setup-Scripts.git"' \
+  '"${REPOS_DIR}/extra-software.git"' \
   '-o "${WORKSPACE_PATH}/scripts.iso"' >> "${test_script}"