diff --git a/Dockerfile.fedora38 b/Dockerfile.fedora38
index 73c2d4b..c07718e 100644
--- a/Dockerfile.fedora38
+++ b/Dockerfile.fedora38
@@ -1,27 +1,37 @@
 FROM fedora:38
 
+# Install base groups
+RUN dnf groupinstall -y 'Development Tools' \
+    && dnf clean all \
+    && rm -rf /var/cache/dnf
+
 # Install base packages
 RUN dnf install -y \
     bash \
+    cmake \
+    cmake-fedora \
     coreutils \
     curl \
     diffutils \
     gcc \
+    gcc-c++ \
     git \
     make \
+    ninja-build \
     patch \
     python \
     rpm-build \
     rpm-devel \
     rpmdevtools \
     rpmlint \
+    rust-cc-devel \
     wget \
     && dnf clean all \
     && rm -rf /var/cache/dnf
 
 # Install rpm macros
 RUN dnf install -y \
-    cmake-rpm-macros.noarch \
+    cmake-rpm-macros \
     fedora-rpm-macros \
     go-rpm-macros \
     kernel-rpm-macros \
diff --git a/Dockerfile.fedora39 b/Dockerfile.fedora39
index ebd5000..e4beba5 100644
--- a/Dockerfile.fedora39
+++ b/Dockerfile.fedora39
@@ -1,27 +1,37 @@
 FROM fedora:39
 
+# Install base groups
+RUN dnf groupinstall -y 'Development Tools' \
+    && dnf clean all \
+    && rm -rf /var/cache/dnf
+
 # Install base packages
 RUN dnf install -y \
     bash \
+    cmake \
+    cmake-fedora \
     coreutils \
     curl \
     diffutils \
     gcc \
+    gcc-c++ \
     git \
     make \
+    ninja-build \
     patch \
     python \
     rpm-build \
     rpm-devel \
     rpmdevtools \
     rpmlint \
+    rust-cc-devel \
     wget \
     && dnf clean all \
     && rm -rf /var/cache/dnf
 
 # Install rpm macros
 RUN dnf install -y \
-    cmake-rpm-macros.noarch \
+    cmake-rpm-macros \
     fedora-rpm-macros \
     go-rpm-macros \
     kernel-rpm-macros \