diff --git a/dist/package/openSUSE-release-tools.spec b/dist/package/openSUSE-release-tools.spec
index e57e6294..d990a584 100644
--- a/dist/package/openSUSE-release-tools.spec
+++ b/dist/package/openSUSE-release-tools.spec
@@ -395,6 +395,7 @@ fi
 %exclude %{_datadir}/%{source_dir}/metrics
 %exclude %{_datadir}/%{source_dir}/metrics.py
 %exclude %{_datadir}/%{source_dir}/metrics_release.py
+%exclude %{_bindir}/osrt-openqa-comments
 %exclude %{_datadir}/%{source_dir}/pkglistgen.py
 %exclude %{_datadir}/%{source_dir}/repo_checker.pl
 %exclude %{_datadir}/%{source_dir}/repo_checker.py
@@ -494,6 +495,7 @@ fi
 %files staging-bot
 %defattr(-,root,root,-)
 %{_bindir}/osrt-devel-project
+%{_bindir}/osrt-openqa-comments
 %{_bindir}/osrt-suppkg_rebuild
 %{_datadir}/%{source_dir}/devel-project.py
 %{_datadir}/%{source_dir}/suppkg_rebuild.py
@@ -501,6 +503,8 @@ fi
 %{_unitdir}/osrt-staging-bot-daily@.timer
 %{_unitdir}/osrt-staging-bot-devel-list.service
 %{_unitdir}/osrt-staging-bot-devel-list.timer
+%{_unitdir}/osrt-staging-bot-openqa-comments@.service
+%{_unitdir}/osrt-staging-bot-openqa-comments@.timer
 %{_unitdir}/osrt-staging-bot-regular@.service
 %{_unitdir}/osrt-staging-bot-regular@.timer
 %{_unitdir}/osrt-staging-bot-reminder.service
diff --git a/openqa-comments.py b/openqa-comments.py
old mode 100644
new mode 100755
diff --git a/systemd/osrt-staging-bot-openqa-comments@.service b/systemd/osrt-staging-bot-openqa-comments@.service
new file mode 100644
index 00000000..ffa154f1
--- /dev/null
+++ b/systemd/osrt-staging-bot-openqa-comments@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=openSUSE Release Tools: staging-bot comment openQA/build results on stagings in %i
+
+[Service]
+User=osrt-staging-bot
+SyslogIdentifier=osrt-staging-bot
+ExecStart=/usr/bin/osrt-openqa-comments -p "%i"
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/osrt-staging-bot-openqa-comments@.timer b/systemd/osrt-staging-bot-openqa-comments@.timer
new file mode 100644
index 00000000..41a14a66
--- /dev/null
+++ b/systemd/osrt-staging-bot-openqa-comments@.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=openSUSE Release Tools: staging-bot comment openQA/build results on stagings in %i
+
+[Timer]
+OnBootSec=120
+OnUnitInactiveSec=3 min
+Unit=osrt-staging-bot-openqa-comments@%i.service
+
+[Install]
+WantedBy=timers.target