diff --git a/.github/workflows/ci2.yml b/.github/workflows/ci2.yml
index 3f9eb05a3b0..50063bbad2b 100644
--- a/.github/workflows/ci2.yml
+++ b/.github/workflows/ci2.yml
@@ -15,7 +15,7 @@ jobs:
   # from scratch, but do not save them.
   Build-and-test:
     name: Run DAOS/NLT tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       # https://github.com/EnricoMi/publish-unit-test-result-action#permissions
       checks: write
@@ -26,7 +26,7 @@ jobs:
         include:
           - distro: ubuntu
             base: ubuntu
-            with: ubuntu:mantic
+            with: ubuntu:oracular
     env:
       DEPS_JOBS: 10
       COMPILER: clang
@@ -76,7 +76,7 @@ jobs:
 
   Build:
     name: Build DAOS
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/landing-builds.yml b/.github/workflows/landing-builds.yml
index 814c4f0e71f..aeedd80b9d6 100644
--- a/.github/workflows/landing-builds.yml
+++ b/.github/workflows/landing-builds.yml
@@ -35,7 +35,7 @@ jobs:
   # for distros where we only want to build on master and not PRs see the Build-branch job below.
   Prepare:
     name: Create Docker images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       max-parallel: 1
@@ -44,7 +44,7 @@ jobs:
         include:
           - distro: ubuntu
             base: ubuntu
-            with: ubuntu:mantic
+            with: ubuntu:oracular
           - distro: rocky
             base: el.9
             with: rockylinux/rockylinux:9
@@ -88,7 +88,7 @@ jobs:
   Build-and-test:
     name: Run DAOS/NLT tests
     needs: Prepare
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       # https://github.com/EnricoMi/publish-unit-test-result-action#permissions
       checks: write
@@ -99,7 +99,7 @@ jobs:
         include:
           - distro: ubuntu
             base: ubuntu
-            with: ubuntu:mantic
+            with: ubuntu:oracular
     env:
       DEPS_JOBS: 10
       BASE_DISTRO: ${{ matrix.with }}
@@ -148,7 +148,7 @@ jobs:
   Build:
     name: Build DAOS in image
     needs: Prepare
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       max-parallel: 2
@@ -158,7 +158,7 @@ jobs:
         include:
           - distro: ubuntu
             base: ubuntu
-            with: ubuntu:mantic
+            with: ubuntu:oracular
           - distro: rocky
             base: el.9
             with: rockylinux/rockylinux:9
@@ -226,7 +226,7 @@ jobs:
 
   Build-branch:
     name: Build DAOS
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -322,7 +322,7 @@ jobs:
         include:
           - distro: ubuntu
             base: ubuntu
-            with: ubuntu:mantic
+            with: ubuntu:oracular
           - distro: alma.8
             base: el.8
             with: almalinux:8
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 67c57bd3154..753641a9e21 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -36,7 +36,7 @@ jobs:
 
   shell-check:
     name: ShellCheck
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
@@ -54,7 +54,7 @@ jobs:
 
   log-check:
     name: Logging macro checking
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
@@ -65,7 +65,7 @@ jobs:
 
   ftest-tags:
     name: Ftest tag check
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
@@ -73,7 +73,7 @@ jobs:
         run: \[ ! -x src/tests/ftest/tags.py \] || ./src/tests/ftest/tags.py lint --verbose
 
   flake8-lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Flake8 check
     steps:
       - name: Check out source repository
@@ -107,7 +107,7 @@ jobs:
 
   doxygen:
     name: Doxygen
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
@@ -128,7 +128,7 @@ jobs:
 
   pylint:
     name: Pylint check
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
@@ -148,7 +148,7 @@ jobs:
 
   codespell:
     name: Codespell
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
@@ -163,7 +163,7 @@ jobs:
 
   linting-summary:
     name: Linting Summary
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [isort, shell-check, log-check, ftest-tags, flake8-lint, doxygen, pylint, codespell]
     if: (!cancelled())
     steps:
diff --git a/.github/workflows/pr-metadata.yml b/.github/workflows/pr-metadata.yml
index a4d08418ccc..9b8e5bcc0c9 100644
--- a/.github/workflows/pr-metadata.yml
+++ b/.github/workflows/pr-metadata.yml
@@ -13,7 +13,7 @@ permissions: {}
 
 jobs:
   example_comment_pr:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       pull-requests: write
     name: Report Jira data to PR comment
diff --git a/.github/workflows/version-checks.yml b/.github/workflows/version-checks.yml
index 4463460b2c5..6f9d4cc7327 100644
--- a/.github/workflows/version-checks.yml
+++ b/.github/workflows/version-checks.yml
@@ -7,13 +7,14 @@ on:
   pull_request:
     paths:
       - 'utils/cq/requirements.txt'
+      - '.github/workflows/version-checks.yml'
 
 permissions: {}
 
 jobs:
   upgrade-check:
     name: Check for updates
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/ci/storage/test_main_storage_prepare_node.sh b/ci/storage/test_main_storage_prepare_node.sh
index 2aa67b9deff..0be5a33167c 100755
--- a/ci/storage/test_main_storage_prepare_node.sh
+++ b/ci/storage/test_main_storage_prepare_node.sh
@@ -40,7 +40,7 @@ if ipmctl show -dimm; then
     ipmctl show -region
     find /dev -name 'pmem*'
 
-    daos_server scm $STORAGE_PREP_OPT --force
+    daos_server scm "$STORAGE_PREP_OPT"  --force
 
     if [ -n "$STORAGE_SCAN" ]; then
       # if we don't have pmem here, then we have a problem.
diff --git a/ci/unit/test_post_always.sh b/ci/unit/test_post_always.sh
index dfe94c2f2d9..5d48ab5482d 100755
--- a/ci/unit/test_post_always.sh
+++ b/ci/unit/test_post_always.sh
@@ -37,7 +37,7 @@ case $STAGE_NAME in
 	;;
 esac
 
-mkdir -p $test_log_dir
+mkdir -p "$test_log_dir"
 
 rsync -v -rlpt -z -e "ssh $SSH_KEY_ARGS" jenkins@"$NODE":build/ .
 
diff --git a/src/tests/ftest/scripts/main.sh b/src/tests/ftest/scripts/main.sh
index e6079637064..706d622479b 100755
--- a/src/tests/ftest/scripts/main.sh
+++ b/src/tests/ftest/scripts/main.sh
@@ -108,4 +108,4 @@ else
     rc=0
 fi
 
-exit $rc
+exit "$rc"
diff --git a/utils/scripts/helpers/install_maldet.sh b/utils/scripts/helpers/install_maldet.sh
index 7b02511afe9..5f9666d348d 100755
--- a/utils/scripts/helpers/install_maldet.sh
+++ b/utils/scripts/helpers/install_maldet.sh
@@ -34,7 +34,7 @@ printf "LogSyslog yes\n" >> /etc/clamd.d/scan.conf
 
 lmd_tarball='maldetect-current.tar.gz'
 : "${REPO_FILE_URL:=https://artifactory.dc.hpdd.intel.com/artifactory/repo-files/}"
-lmd_base_url="$(dirname $REPO_FILE_URL)"
+lmd_base_url="$(dirname "$REPO_FILE_URL")"
 lmd_base="${lmd_base_url#*://}"
 lmd_url="${lmd_base_url}/maldetect/downloads/${lmd_tarball}"
 curl "${lmd_url}" --silent --show-error --fail -o "/var/tmp/${lmd_tarball}"