diff --git a/systemd/osrt-leaper-review.service b/systemd/osrt-leaper-review.service
index 34b81359..76d8220b 100644
--- a/systemd/osrt-leaper-review.service
+++ b/systemd/osrt-leaper-review.service
@@ -2,7 +2,6 @@
 Description=openSUSE Release Tools: leaper review
 
 [Service]
-Type=oneshot
 User=osrt-leaper
 ExecStart=/usr/bin/osrt-leaper --verbose --manual-version-updates --manual-maintenance-updates review
 
diff --git a/systemd/osrt-metrics@.service b/systemd/osrt-metrics@.service
index e76d88dc..2b323490 100644
--- a/systemd/osrt-metrics@.service
+++ b/systemd/osrt-metrics@.service
@@ -2,11 +2,9 @@
 Description=openSUSE Release Tools: metrics for %i
 
 [Service]
-Type=oneshot
 User=osrt-metrics
 SyslogIdentifier=osrt-metrics
 ExecStart=/usr/bin/osrt-metrics --debug -p "%i"
-TimeoutStartSec=8 hour
 
 [Install]
 WantedBy=multi-user.target
diff --git a/systemd/osrt-repo-checker-project_only@.service b/systemd/osrt-repo-checker-project_only@.service
index c1b2258a..4c36c15a 100644
--- a/systemd/osrt-repo-checker-project_only@.service
+++ b/systemd/osrt-repo-checker-project_only@.service
@@ -2,11 +2,9 @@
 Description=openSUSE Release Tools: repo-checker project_only for %i
 
 [Service]
-Type=oneshot
 User=osrt-repo-checker
 SyslogIdentifier=osrt-repo-checker
 ExecStart=/usr/bin/osrt-repo_checker --debug project_only --post-comments "%i"
-TimeoutStartSec=8 hour
 
 [Install]
 WantedBy=multi-user.target
diff --git a/systemd/osrt-repo-checker.service b/systemd/osrt-repo-checker.service
index e1c4e3c2..5fc05874 100644
--- a/systemd/osrt-repo-checker.service
+++ b/systemd/osrt-repo-checker.service
@@ -2,11 +2,9 @@
 Description=openSUSE Release Tools: repo-checker
 
 [Service]
-Type=oneshot
 User=osrt-repo-checker
 SyslogIdentifier=osrt-repo-checker
 ExecStart=/usr/bin/osrt-repo_checker --debug review
-TimeoutStartSec=8 hour
 
 [Install]
 WantedBy=multi-user.target
diff --git a/systemd/osrt-staging-bot-daily@.service b/systemd/osrt-staging-bot-daily@.service
index 256c012c..bccad11a 100644
--- a/systemd/osrt-staging-bot-daily@.service
+++ b/systemd/osrt-staging-bot-daily@.service
@@ -2,13 +2,11 @@
 Description=openSUSE Release Tools: staging-bot daily for %i
 
 [Service]
-Type=oneshot
 User=osrt-staging-bot
 SyslogIdentifier=osrt-staging-bot
 ExecStart=/usr/bin/env bash -c ' \
   osc staging -p "%i" unignore --cleanup \
   '
-TimeoutStartSec=3 hour
 
 [Install]
 WantedBy=multi-user.target
diff --git a/systemd/osrt-staging-bot-regular@.service b/systemd/osrt-staging-bot-regular@.service
index 1af2d816..d40976c2 100644
--- a/systemd/osrt-staging-bot-regular@.service
+++ b/systemd/osrt-staging-bot-regular@.service
@@ -2,7 +2,6 @@
 Description=openSUSE Release Tools: staging-bot regular for %i
 
 [Service]
-Type=oneshot
 User=osrt-staging-bot
 SyslogIdentifier=osrt-staging-bot
 ExecStart=/usr/bin/env bash -c ' \
@@ -13,7 +12,6 @@ ExecStart=/usr/bin/env bash -c ' \
   osc staging -p "%i" unselect --cleanup && \
   osc staging -p "%i" repair --cleanup \
   '
-TimeoutStartSec=5 hour
 
 [Install]
 WantedBy=multi-user.target
diff --git a/systemd/osrt-staging-bot-reminder.service b/systemd/osrt-staging-bot-reminder.service
index 052ab034..aa940688 100644
--- a/systemd/osrt-staging-bot-reminder.service
+++ b/systemd/osrt-staging-bot-reminder.service
@@ -2,14 +2,12 @@
 Description=openSUSE Release Tools: staging-bot reminder
 
 [Service]
-Type=oneshot
 User=osrt-staging-bot
 SyslogIdentifier=osrt-staging-bot
 ExecStart=/usr/bin/env bash -c ' \
   /usr/bin/osrt-devel-project reviews --min-age 3 --remind && \
   /usr/bin/osrt-devel-project requests --min-age 3 --remind \
   '
-TimeoutStartSec=3 hour
 
 [Install]
 WantedBy=multi-user.target
diff --git a/systemd/osrt-staging-bot-support-rebuild@.service b/systemd/osrt-staging-bot-support-rebuild@.service
index ff9d52d4..cb4d80e7 100644
--- a/systemd/osrt-staging-bot-support-rebuild@.service
+++ b/systemd/osrt-staging-bot-support-rebuild@.service
@@ -2,7 +2,6 @@
 Description=openSUSE Release Tools: staging-bot regular for %i (rebuild staging project if support package staged)
 
 [Service]
-Type=oneshot
 User=osrt-staging-bot
 SyslogIdentifier=osrt-staging-bot
 ExecStart=/usr/bin/osrt-suppkg_rebuild -p "%i"