diff --git a/images/almalinux/8.10/base/version b/images/almalinux/8.10/base/version
index 058cb29..8ee5b41 100644
--- a/images/almalinux/8.10/base/version
+++ b/images/almalinux/8.10/base/version
@@ -1 +1 @@
-20260117
+20260516
diff --git a/images/almalinux/8.10/rpmbuilder/variables.auto.pkrvars.hcl b/images/almalinux/8.10/rpmbuilder/variables.auto.pkrvars.hcl
index 0e2e814..18db303 100644
--- a/images/almalinux/8.10/rpmbuilder/variables.auto.pkrvars.hcl
+++ b/images/almalinux/8.10/rpmbuilder/variables.auto.pkrvars.hcl
@@ -6,6 +6,7 @@ packages = [
   "automake",
   "binutils",
   "bison",
+  "buildah",
   "byacc",
   "cmake",
   "diffstat",
diff --git a/images/almalinux/9.7/base/version b/images/almalinux/9.7/base/version
index 1f662c8..8ee5b41 100644
--- a/images/almalinux/9.7/base/version
+++ b/images/almalinux/9.7/base/version
@@ -1 +1 @@
-20260325
+20260516
diff --git a/images/almalinux/9.7/rpmbuilder/variables.auto.pkrvars.hcl b/images/almalinux/9.7/rpmbuilder/variables.auto.pkrvars.hcl
index b5a902a..3e97145 100644
--- a/images/almalinux/9.7/rpmbuilder/variables.auto.pkrvars.hcl
+++ b/images/almalinux/9.7/rpmbuilder/variables.auto.pkrvars.hcl
@@ -6,6 +6,7 @@ packages = [
   "automake",
   "binutils",
   "bison",
+  "buildah",
   "byacc",
   "cmake",
   "diffstat",
diff --git a/images/almalinux/9.7/rpmbuilder/version b/images/almalinux/9.7/rpmbuilder/version
index be1b8db..8ee5b41 100644
--- a/images/almalinux/9.7/rpmbuilder/version
+++ b/images/almalinux/9.7/rpmbuilder/version
@@ -1 +1 @@
-20260308
+20260516
diff --git a/images/fedora/42/base/variables.auto.pkrvars.hcl b/images/fedora/42/base/variables.auto.pkrvars.hcl
index d62cd21..b2c8f99 100644
--- a/images/fedora/42/base/variables.auto.pkrvars.hcl
+++ b/images/fedora/42/base/variables.auto.pkrvars.hcl
@@ -4,7 +4,7 @@ deploy_files_from_image = true
 deploy_files_from_common = false
 scripts_pre_file_copy = [
   "rm -f /etc/yum.repos.d/*.repo",
-  "curl -k -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1/files/12294 && rpm -i unkin-ca-certificates.rpm",
+  "curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1/files/12294 && rpm -i unkin-ca-certificates.rpm",
 ]
 packages = [
   "git",
diff --git a/images/fedora/42/rpmbuilder/builds b/images/fedora/42/rpmbuilder/builds
new file mode 100644
index 0000000..bdb9670
--- /dev/null
+++ b/images/fedora/42/rpmbuilder/builds
@@ -0,0 +1 @@
+docker
diff --git a/images/fedora/42/rpmbuilder/variables.auto.pkrvars.hcl b/images/fedora/42/rpmbuilder/variables.auto.pkrvars.hcl
new file mode 100644
index 0000000..1ba81ed
--- /dev/null
+++ b/images/fedora/42/rpmbuilder/variables.auto.pkrvars.hcl
@@ -0,0 +1,47 @@
+# almalinux/9.7/rpmbuilder
+docker_source = "git.unkin.net/unkin/fedora42-base:latest"
+packages = [
+  "asciidoc",
+  "autoconf",
+  "automake",
+  "binutils",
+  "bison",
+  "buildah",
+  "byacc",
+  "cmake",
+  "diffstat",
+  "flex",
+  "gcc",
+  "gcc-c++",
+  "gdb",
+  "glibc-devel",
+  "go",
+  "gzip",
+  "intltool",
+  "jna",
+  "ltrace",
+  "nfpm",
+  "patchutils",
+  "perl-Fedora-VSP",
+  "perl-generators",
+  "pesign",
+  "pkgconf",
+  "pkgconf-m4",
+  "pkgconf-pkg-config",
+  "redhat-rpm-config",
+  "rpm",
+  "rpm-build",
+  "rpm-sign",
+  "rpmdevtools",
+  "rpmlint",
+  "source-highlight",
+  "strace",
+  "systemtap",
+  "tar",
+  "valgrind",
+  "valgrind-devel",
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
diff --git a/images/fedora/42/rpmbuilder/version b/images/fedora/42/rpmbuilder/version
new file mode 100644
index 0000000..be1b8db
--- /dev/null
+++ b/images/fedora/42/rpmbuilder/version
@@ -0,0 +1 @@
+20260308
diff --git a/images/fedora/43/base/variables.auto.pkrvars.hcl b/images/fedora/43/base/variables.auto.pkrvars.hcl
index 5ce60b0..44db7a2 100644
--- a/images/fedora/43/base/variables.auto.pkrvars.hcl
+++ b/images/fedora/43/base/variables.auto.pkrvars.hcl
@@ -4,7 +4,7 @@ deploy_files_from_image = true
 deploy_files_from_common = false
 scripts_pre_file_copy = [
   "rm -f /etc/yum.repos.d/*.repo",
-  "curl -k -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1/files/12294 && rpm -i unkin-ca-certificates.rpm",
+  "curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1/files/12294 && rpm -i unkin-ca-certificates.rpm",
 ]
 packages = [
   "git",
diff --git a/images/fedora/43/rpmbuilder/builds b/images/fedora/43/rpmbuilder/builds
new file mode 100644
index 0000000..bdb9670
--- /dev/null
+++ b/images/fedora/43/rpmbuilder/builds
@@ -0,0 +1 @@
+docker
diff --git a/images/fedora/43/rpmbuilder/variables.auto.pkrvars.hcl b/images/fedora/43/rpmbuilder/variables.auto.pkrvars.hcl
new file mode 100644
index 0000000..fe1270d
--- /dev/null
+++ b/images/fedora/43/rpmbuilder/variables.auto.pkrvars.hcl
@@ -0,0 +1,47 @@
+# almalinux/9.7/rpmbuilder
+docker_source = "git.unkin.net/unkin/fedora43-base:latest"
+packages = [
+  "asciidoc",
+  "autoconf",
+  "automake",
+  "binutils",
+  "bison",
+  "buildah",
+  "byacc",
+  "cmake",
+  "diffstat",
+  "flex",
+  "gcc",
+  "gcc-c++",
+  "gdb",
+  "glibc-devel",
+  "go",
+  "gzip",
+  "intltool",
+  "jna",
+  "ltrace",
+  "nfpm",
+  "patchutils",
+  "perl-Fedora-VSP",
+  "perl-generators",
+  "pesign",
+  "pkgconf",
+  "pkgconf-m4",
+  "pkgconf-pkg-config",
+  "redhat-rpm-config",
+  "rpm",
+  "rpm-build",
+  "rpm-sign",
+  "rpmdevtools",
+  "rpmlint",
+  "source-highlight",
+  "strace",
+  "systemtap",
+  "tar",
+  "valgrind",
+  "valgrind-devel",
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
diff --git a/images/fedora/43/rpmbuilder/version b/images/fedora/43/rpmbuilder/version
new file mode 100644
index 0000000..be1b8db
--- /dev/null
+++ b/images/fedora/43/rpmbuilder/version
@@ -0,0 +1 @@
+20260308
diff --git a/images/fedora/44/base/variables.auto.pkrvars.hcl b/images/fedora/44/base/variables.auto.pkrvars.hcl
index 1f3741b..6c58543 100644
--- a/images/fedora/44/base/variables.auto.pkrvars.hcl
+++ b/images/fedora/44/base/variables.auto.pkrvars.hcl
@@ -4,7 +4,7 @@ deploy_files_from_image = true
 deploy_files_from_common = false
 scripts_pre_file_copy = [
   "rm -f /etc/yum.repos.d/*.repo",
-  "curl -k -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1/files/12294 && rpm -i unkin-ca-certificates.rpm",
+  "curl -sk -o unkin-ca-certificates.rpm https://git.unkin.net/unkin/-/packages/rpm/unkin-ca-certificates/2025.7.13-1/files/12294 && rpm -i unkin-ca-certificates.rpm",
 ]
 packages = [
   "git",
diff --git a/images/fedora/44/rpmbuilder/builds b/images/fedora/44/rpmbuilder/builds
new file mode 100644
index 0000000..bdb9670
--- /dev/null
+++ b/images/fedora/44/rpmbuilder/builds
@@ -0,0 +1 @@
+docker
diff --git a/images/fedora/44/rpmbuilder/variables.auto.pkrvars.hcl b/images/fedora/44/rpmbuilder/variables.auto.pkrvars.hcl
new file mode 100644
index 0000000..ae019fe
--- /dev/null
+++ b/images/fedora/44/rpmbuilder/variables.auto.pkrvars.hcl
@@ -0,0 +1,47 @@
+# almalinux/9.7/rpmbuilder
+docker_source = "git.unkin.net/unkin/fedora44-base:latest"
+packages = [
+  "asciidoc",
+  "autoconf",
+  "automake",
+  "binutils",
+  "bison",
+  "buildah",
+  "byacc",
+  "cmake",
+  "diffstat",
+  "flex",
+  "gcc",
+  "gcc-c++",
+  "gdb",
+  "glibc-devel",
+  "go",
+  "gzip",
+  "intltool",
+  "jna",
+  "ltrace",
+  "nfpm",
+  "patchutils",
+  "perl-Fedora-VSP",
+  "perl-generators",
+  "pesign",
+  "pkgconf",
+  "pkgconf-m4",
+  "pkgconf-pkg-config",
+  "redhat-rpm-config",
+  "rpm",
+  "rpm-build",
+  "rpm-sign",
+  "rpmdevtools",
+  "rpmlint",
+  "source-highlight",
+  "strace",
+  "systemtap",
+  "tar",
+  "valgrind",
+  "valgrind-devel",
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
diff --git a/images/fedora/44/rpmbuilder/version b/images/fedora/44/rpmbuilder/version
new file mode 100644
index 0000000..be1b8db
--- /dev/null
+++ b/images/fedora/44/rpmbuilder/version
@@ -0,0 +1 @@
+20260308