diff --git a/services/correlator/Dockerfile.package b/services/correlator/Dockerfile.package
index daeb463..e74d61a 100644
--- a/services/correlator/Dockerfile.package
+++ b/services/correlator/Dockerfile.package
@@ -43,7 +43,7 @@ WORKDIR /package
 
 ARG VERSION=dev
 
-RUN dnf install -y rpm-build rpmdevtools && dnf clean all
+RUN dnf install -y rpm-build rpmdevtools systemd-rpm-macros && dnf clean all
 
 RUN mkdir -p /root/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} && \
     mkdir -p /packages/rpm/{el8,el9,el10}
@@ -71,7 +71,7 @@ COPY services/correlator/packaging/rpm/logcorrelator.spec /root/rpmbuild/SPECS/l
 # el8
 RUN rpmbuild --define "_topdir /root/rpmbuild" \
              --define "dist .el8" \
-             --define "version ${VERSION}" \
+             --define "build_version ${VERSION}" \
              --target x86_64 \
              -bb /root/rpmbuild/SPECS/logcorrelator.spec && \
     cp /root/rpmbuild/RPMS/x86_64/*.el8.x86_64.rpm /packages/rpm/el8/
@@ -79,7 +79,7 @@ RUN rpmbuild --define "_topdir /root/rpmbuild" \
 # el9
 RUN rpmbuild --define "_topdir /root/rpmbuild" \
              --define "dist .el9" \
-             --define "version ${VERSION}" \
+             --define "build_version ${VERSION}" \
              --target x86_64 \
              -bb /root/rpmbuild/SPECS/logcorrelator.spec && \
     cp /root/rpmbuild/RPMS/x86_64/*.el9.x86_64.rpm /packages/rpm/el9/
@@ -87,7 +87,7 @@ RUN rpmbuild --define "_topdir /root/rpmbuild" \
 # el10
 RUN rpmbuild --define "_topdir /root/rpmbuild" \
              --define "dist .el10" \
-             --define "version ${VERSION}" \
+             --define "build_version ${VERSION}" \
              --target x86_64 \
              -bb /root/rpmbuild/SPECS/logcorrelator.spec && \
     cp /root/rpmbuild/RPMS/x86_64/*.el10.x86_64.rpm /packages/rpm/el10/
diff --git a/services/correlator/packaging/rpm/logcorrelator.spec b/services/correlator/packaging/rpm/logcorrelator.spec
index 312e1ea..fdb72ed 100644
--- a/services/correlator/packaging/rpm/logcorrelator.spec
+++ b/services/correlator/packaging/rpm/logcorrelator.spec
@@ -15,8 +15,8 @@ Packager:       logcorrelator <dev@example.com>
 BuildArch:      x86_64
 
 # Version macro with safe fallback
-%if %{defined version}
-%define spec_version %{version}
+%if %{defined build_version}
+%define spec_version %{build_version}
 %else
 %define spec_version 1.1.22
 %endif
diff --git a/services/mod-reqin-log/Dockerfile.tests b/services/mod-reqin-log/Dockerfile.tests
index 00813b6..30cb14c 100644
--- a/services/mod-reqin-log/Dockerfile.tests
+++ b/services/mod-reqin-log/Dockerfile.tests
@@ -40,4 +40,4 @@ COPY services/mod-reqin-log/Makefile Makefile
 
 RUN mkdir -p build/tests && cd build/tests && cmake ../../ && make
 
-CMD ["ctest", "--output-on-failure"]
+CMD ["ctest", "--test-dir", "build/tests", "--output-on-failure"]
diff --git a/services/sentinel/Dockerfile.package b/services/sentinel/Dockerfile.package
index 633895b..aba513d 100644
--- a/services/sentinel/Dockerfile.package
+++ b/services/sentinel/Dockerfile.package
@@ -51,7 +51,7 @@ WORKDIR /package
 
 ARG VERSION=dev
 
-RUN dnf install -y rpm-build rpmdevtools && dnf clean all
+RUN dnf install -y rpm-build rpmdevtools systemd-rpm-macros && dnf clean all
 
 RUN mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} && \
     mkdir -p /root/rpmbuild/SOURCES/logrotate && \