diff --git a/Builds/containers/gitlab-ci/pkgbuild.yml b/Builds/containers/gitlab-ci/pkgbuild.yml
index e2326852867..0aa46d1eecf 100644
--- a/Builds/containers/gitlab-ci/pkgbuild.yml
+++ b/Builds/containers/gitlab-ci/pkgbuild.yml
@@ -193,12 +193,30 @@ rocky_8_smoketest:
     name: artifactory.ops.ripple.com/rockylinux/rockylinux:8
   <<: *run_local_smoketest
 
-fedora_37_smoketest:
+rocky_9_smoketest:
   stage: smoketest
   dependencies:
     - rpm_build
   image:
-    name: artifactory.ops.ripple.com/fedora:37
+    name: artifactory.ops.ripple.com/rockylinux/rockylinux:9
+
+  <<: *run_local_smoketest
+
+alma_8_smoketest:
+  stage: smoketest
+  dependencies:
+    - rpm_build
+  image:
+    name: artifactory.ops.ripple.com/almalinux:8
+  <<: *run_local_smoketest
+
+alma_9_smoketest:
+  stage: smoketest
+  dependencies:
+    - rpm_build
+  image:
+    name: artifactory.ops.ripple.com/almalinux:9
+
   <<: *run_local_smoketest
 
 fedora_38_smoketest:
@@ -209,6 +227,14 @@ fedora_38_smoketest:
     name: artifactory.ops.ripple.com/fedora:38
   <<: *run_local_smoketest
 
+fedora_39_smoketest:
+  stage: smoketest
+  dependencies:
+    - rpm_build
+  image:
+    name: artifactory.ops.ripple.com/fedora:39
+  <<: *run_local_smoketest
+
 ubuntu_18_smoketest:
   stage: smoketest
   dependencies:
@@ -249,6 +275,14 @@ debian_11_smoketest:
     name: artifactory.ops.ripple.com/debian:11
   <<: *run_local_smoketest
 
+debian_12_smoketest:
+  stage: smoketest
+  dependencies:
+    - dpkg_build
+  image:
+    name: artifactory.ops.ripple.com/debian:12
+  <<: *run_local_smoketest
+
 #########################################################################
 ##                                                                     ##
 ##  stage: verify_sig                                                  ##
@@ -345,7 +379,6 @@ centos_7_verify_repo_test:
   <<: *only_primary
   <<: *run_repo_smoketest
 
-
 rocky_8_verify_repo_test:
   stage: verify_from_test
   variables:
@@ -357,12 +390,34 @@ rocky_8_verify_repo_test:
   <<: *only_primary
   <<: *run_repo_smoketest
 
-fedora_37_verify_repo_test:
+rocky_9_verify_repo_test:
   stage: verify_from_test
   variables:
     RPM_REPO: "rippled-rpm-test-mirror"
   image:
-    name: artifactory.ops.ripple.com/fedora:37
+    name: artifactory.ops.ripple.com/rockylinux/rockylinux:9
+  dependencies:
+    - rpm_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+almalinux_8_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    RPM_REPO: "rippled-rpm-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/almalinux:8
+  dependencies:
+    - rpm_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+almalinux_9_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    RPM_REPO: "rippled-rpm-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/almalinux:9
   dependencies:
     - rpm_sign
   <<: *only_primary
@@ -379,6 +434,18 @@ fedora_38_verify_repo_test:
   <<: *only_primary
   <<: *run_repo_smoketest
 
+fedora_39_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    RPM_REPO: "rippled-rpm-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/fedora:39
+
+  dependencies:
+    - rpm_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
 ubuntu_18_verify_repo_test:
   stage: verify_from_test
   variables:
@@ -439,6 +506,18 @@ debian_11_verify_repo_test:
   <<: *only_primary
   <<: *run_repo_smoketest
 
+debian_12_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    DISTRO: "bookworm"
+    DEB_REPO: "rippled-deb-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/debian:12
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
 #########################################################################
 ##                                                                     ##
 ##  stage: wait_approval_prod                                          ##
@@ -515,6 +594,39 @@ rocky_8_verify_repo_prod:
   <<: *only_primary
   <<: *run_repo_smoketest
 
+rocky_9_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    RPM_REPO: "rippled-rpm"
+  image:
+    name: artifactory.ops.ripple.com/rockylinux/rockylinux:9
+  dependencies:
+    - rpm_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+alma_8_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    RPM_REPO: "rippled-rpm"
+  image:
+    name: artifactory.ops.ripple.com/almalinux:8
+  dependencies:
+    - rpm_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+alma_9_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    RPM_REPO: "rippled-rpm"
+  image:
+    name: artifactory.ops.ripple.com/almalinux:9
+  dependencies:
+    - rpm_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
 fedora_37_verify_repo_prod:
   stage: verify_from_prod
   variables:
@@ -597,6 +709,19 @@ debian_11_verify_repo_prod:
   <<: *only_primary
   <<: *run_repo_smoketest
 
+debian_12_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    DISTRO: "bookworm"
+    DEB_REPO: "rippled-deb"
+  image:
+    name: artifactory.ops.ripple.com/debian:12
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+
 #########################################################################
 ##                                                                     ##
 ##  stage: get_final_hashes                                            ##
diff --git a/Builds/containers/gitlab-ci/smoketest.sh b/Builds/containers/gitlab-ci/smoketest.sh
index 32a8e3407f6..56bd38fac6a 100644
--- a/Builds/containers/gitlab-ci/smoketest.sh
+++ b/Builds/containers/gitlab-ci/smoketest.sh
@@ -16,7 +16,7 @@ case ${ID} in
     ubuntu|debian)
         pkgtype="dpkg"
         ;;
-    fedora|centos|rhel|scientific|rocky)
+    fedora|centos|rhel|scientific|rocky|almalinux)
         pkgtype="rpm"
         ;;
     *)
@@ -79,16 +79,8 @@ else
         # yum --showduplicates list rippled
         yum -y install ${rpm_version_release}
     elif [ "${install_from}" = "local" ] ; then
-        # cached pkg install
-        pkgs=("yum-utils openssl-static zlib-static")
-        if [[ "$ID" =~ rocky|fedora ]]; then
-            if [[ "$ID" =~ "rocky" ]]; then
-                sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/Rocky-PowerTools.repo
-            fi
-            pkgs="${pkgs[@]/openssl-static}"
-        fi
-        yum install -y $pkgs
         rm -f build/rpm/packages/rippled-debug*.rpm
+        rm -f build/rpm/packages/rippled-devel*.rpm
         rm -f build/rpm/packages/*.src.rpm
         rpm -i build/rpm/packages/*.rpm
     else