diff --git a/packaging/buildrpm.sh b/packaging/buildrpm.sh
index 00d427ae..0d2de9e5 100755
--- a/packaging/buildrpm.sh
+++ b/packaging/buildrpm.sh
@@ -61,6 +61,10 @@ mkdir -p target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/opt/stackable/${PACKAGE_NAME
 # Create config directory and copy config file template over
 mkdir -p target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/etc/stackable/${PACKAGE_NAME}
 cp packaging/config/agent.conf target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/etc/stackable/${PACKAGE_NAME}
+mkdir target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/etc/stackable/${PACKAGE_NAME}/secret
+mkdir -p target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/var/lib/stackable/${PACKAGE_NAME}
+mkdir -p target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/var/log/stackable/servicelogs
+mkdir -p target/rpm/SOURCES/${PACKAGE_NAME}-VERSION/opt/stackable/packages
 
 # The packaging source directory does not contain the version yet, as this will need to be replaced for every
 # execution. Instead the directory name contains the marker "VERSION" which we now replace with the actual version.
diff --git a/packaging/rpm/SPECS/stackable-agent.spec b/packaging/rpm/SPECS/stackable-agent.spec
index 6c277914..af1c4e60 100644
--- a/packaging/rpm/SPECS/stackable-agent.spec
+++ b/packaging/rpm/SPECS/stackable-agent.spec
@@ -33,11 +33,6 @@ cp -a * %{buildroot}
 
 %post
 systemctl daemon-reload
-mkdir -p /opt/stackable/packages
-mkdir -p %{_vardir}
-mkdir -p /var/log/stackable/servicelogs
-mkdir -p %{_confdir}
-mkdir -m 700 %{_confdir}/secret
 
 %preun
 if [ $1 == 0 ]; then #uninstall
@@ -57,6 +52,12 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}
 %{_bindir}/*
 %{_servicedir}/%{name}.service
-%{_confdir}/agent.conf
\ No newline at end of file
+%dir %{_confdir}
+%config %{_confdir}/agent.conf
+%dir %attr(700, root, root)  %{_confdir}/secret
+%dir %{_vardir}
+%dir /var/log/stackable/servicelogs
+%dir /opt/stackable/packages
\ No newline at end of file