diff --git a/conf/init/service/blobuploadcleanupworker/log/run b/conf/init/service/batch/blobuploadcleanupworker/log/run
similarity index 100%
rename from conf/init/service/blobuploadcleanupworker/log/run
rename to conf/init/service/batch/blobuploadcleanupworker/log/run
diff --git a/conf/init/service/blobuploadcleanupworker/run b/conf/init/service/batch/blobuploadcleanupworker/run
similarity index 100%
rename from conf/init/service/blobuploadcleanupworker/run
rename to conf/init/service/batch/blobuploadcleanupworker/run
diff --git a/conf/init/service/buildlogsarchiver/log/run b/conf/init/service/batch/buildlogsarchiver/log/run
similarity index 100%
rename from conf/init/service/buildlogsarchiver/log/run
rename to conf/init/service/batch/buildlogsarchiver/log/run
diff --git a/conf/init/service/buildlogsarchiver/run b/conf/init/service/batch/buildlogsarchiver/run
similarity index 100%
rename from conf/init/service/buildlogsarchiver/run
rename to conf/init/service/batch/buildlogsarchiver/run
diff --git a/conf/init/service/buildmanager/log/run b/conf/init/service/batch/buildmanager/log/run
similarity index 100%
rename from conf/init/service/buildmanager/log/run
rename to conf/init/service/batch/buildmanager/log/run
diff --git a/conf/init/service/buildmanager/run b/conf/init/service/batch/buildmanager/run
similarity index 100%
rename from conf/init/service/buildmanager/run
rename to conf/init/service/batch/buildmanager/run
diff --git a/conf/init/service/chunkcleanupworker/log/run b/conf/init/service/batch/chunkcleanupworker/log/run
similarity index 100%
rename from conf/init/service/chunkcleanupworker/log/run
rename to conf/init/service/batch/chunkcleanupworker/log/run
diff --git a/conf/init/service/chunkcleanupworker/run b/conf/init/service/batch/chunkcleanupworker/run
similarity index 100%
rename from conf/init/service/chunkcleanupworker/run
rename to conf/init/service/batch/chunkcleanupworker/run
diff --git a/conf/init/service/gcworker/log/run b/conf/init/service/batch/gcworker/log/run
similarity index 100%
rename from conf/init/service/gcworker/log/run
rename to conf/init/service/batch/gcworker/log/run
diff --git a/conf/init/service/gcworker/run b/conf/init/service/batch/gcworker/run
similarity index 100%
rename from conf/init/service/gcworker/run
rename to conf/init/service/batch/gcworker/run
diff --git a/conf/init/service/globalpromstats/log/run b/conf/init/service/batch/globalpromstats/log/run
similarity index 100%
rename from conf/init/service/globalpromstats/log/run
rename to conf/init/service/batch/globalpromstats/log/run
diff --git a/conf/init/service/globalpromstats/run b/conf/init/service/batch/globalpromstats/run
similarity index 100%
rename from conf/init/service/globalpromstats/run
rename to conf/init/service/batch/globalpromstats/run
diff --git a/conf/init/service/logrotateworker/log/run b/conf/init/service/batch/logrotateworker/log/run
similarity index 100%
rename from conf/init/service/logrotateworker/log/run
rename to conf/init/service/batch/logrotateworker/log/run
diff --git a/conf/init/service/logrotateworker/run b/conf/init/service/batch/logrotateworker/run
similarity index 100%
rename from conf/init/service/logrotateworker/run
rename to conf/init/service/batch/logrotateworker/run
diff --git a/conf/init/service/notificationworker/log/run b/conf/init/service/batch/notificationworker/log/run
similarity index 100%
rename from conf/init/service/notificationworker/log/run
rename to conf/init/service/batch/notificationworker/log/run
diff --git a/conf/init/service/notificationworker/run b/conf/init/service/batch/notificationworker/run
similarity index 100%
rename from conf/init/service/notificationworker/run
rename to conf/init/service/batch/notificationworker/run
diff --git a/conf/init/service/queuecleanupworker/log/run b/conf/init/service/batch/queuecleanupworker/log/run
similarity index 100%
rename from conf/init/service/queuecleanupworker/log/run
rename to conf/init/service/batch/queuecleanupworker/log/run
diff --git a/conf/init/service/queuecleanupworker/run b/conf/init/service/batch/queuecleanupworker/run
similarity index 100%
rename from conf/init/service/queuecleanupworker/run
rename to conf/init/service/batch/queuecleanupworker/run
diff --git a/conf/init/service/repositoryactioncounter/log/run b/conf/init/service/batch/repositoryactioncounter/log/run
similarity index 100%
rename from conf/init/service/repositoryactioncounter/log/run
rename to conf/init/service/batch/repositoryactioncounter/log/run
diff --git a/conf/init/service/repositoryactioncounter/run b/conf/init/service/batch/repositoryactioncounter/run
similarity index 100%
rename from conf/init/service/repositoryactioncounter/run
rename to conf/init/service/batch/repositoryactioncounter/run
diff --git a/conf/init/service/security_notification_worker/log/run b/conf/init/service/batch/security_notification_worker/log/run
similarity index 100%
rename from conf/init/service/security_notification_worker/log/run
rename to conf/init/service/batch/security_notification_worker/log/run
diff --git a/conf/init/service/security_notification_worker/run b/conf/init/service/batch/security_notification_worker/run
similarity index 100%
rename from conf/init/service/security_notification_worker/run
rename to conf/init/service/batch/security_notification_worker/run
diff --git a/conf/init/service/securityworker/log/run b/conf/init/service/batch/securityworker/log/run
similarity index 100%
rename from conf/init/service/securityworker/log/run
rename to conf/init/service/batch/securityworker/log/run
diff --git a/conf/init/service/securityworker/run b/conf/init/service/batch/securityworker/run
similarity index 100%
rename from conf/init/service/securityworker/run
rename to conf/init/service/batch/securityworker/run
diff --git a/conf/init/service/storagereplication/log/run b/conf/init/service/batch/storagereplication/log/run
similarity index 100%
rename from conf/init/service/storagereplication/log/run
rename to conf/init/service/batch/storagereplication/log/run
diff --git a/conf/init/service/storagereplication/run b/conf/init/service/batch/storagereplication/run
similarity index 100%
rename from conf/init/service/storagereplication/run
rename to conf/init/service/batch/storagereplication/run
diff --git a/conf/init/service/teamsyncworker/log/run b/conf/init/service/batch/teamsyncworker/log/run
similarity index 100%
rename from conf/init/service/teamsyncworker/log/run
rename to conf/init/service/batch/teamsyncworker/log/run
diff --git a/conf/init/service/teamsyncworker/run b/conf/init/service/batch/teamsyncworker/run
similarity index 100%
rename from conf/init/service/teamsyncworker/run
rename to conf/init/service/batch/teamsyncworker/run
diff --git a/conf/init/service/dnsmasq/log/run b/conf/init/service/interactive/dnsmasq/log/run
similarity index 100%
rename from conf/init/service/dnsmasq/log/run
rename to conf/init/service/interactive/dnsmasq/log/run
diff --git a/conf/init/service/dnsmasq/run b/conf/init/service/interactive/dnsmasq/run
similarity index 100%
rename from conf/init/service/dnsmasq/run
rename to conf/init/service/interactive/dnsmasq/run
diff --git a/conf/init/service/gunicorn_registry/log/run b/conf/init/service/interactive/gunicorn_registry/log/run
similarity index 100%
rename from conf/init/service/gunicorn_registry/log/run
rename to conf/init/service/interactive/gunicorn_registry/log/run
diff --git a/conf/init/service/gunicorn_registry/run b/conf/init/service/interactive/gunicorn_registry/run
similarity index 100%
rename from conf/init/service/gunicorn_registry/run
rename to conf/init/service/interactive/gunicorn_registry/run
diff --git a/conf/init/service/gunicorn_secscan/log/run b/conf/init/service/interactive/gunicorn_secscan/log/run
similarity index 100%
rename from conf/init/service/gunicorn_secscan/log/run
rename to conf/init/service/interactive/gunicorn_secscan/log/run
diff --git a/conf/init/service/gunicorn_secscan/run b/conf/init/service/interactive/gunicorn_secscan/run
similarity index 100%
rename from conf/init/service/gunicorn_secscan/run
rename to conf/init/service/interactive/gunicorn_secscan/run
diff --git a/conf/init/service/gunicorn_verbs/log/run b/conf/init/service/interactive/gunicorn_verbs/log/run
similarity index 100%
rename from conf/init/service/gunicorn_verbs/log/run
rename to conf/init/service/interactive/gunicorn_verbs/log/run
diff --git a/conf/init/service/gunicorn_verbs/run b/conf/init/service/interactive/gunicorn_verbs/run
similarity index 100%
rename from conf/init/service/gunicorn_verbs/run
rename to conf/init/service/interactive/gunicorn_verbs/run
diff --git a/conf/init/service/gunicorn_web/log/run b/conf/init/service/interactive/gunicorn_web/log/run
similarity index 100%
rename from conf/init/service/gunicorn_web/log/run
rename to conf/init/service/interactive/gunicorn_web/log/run
diff --git a/conf/init/service/gunicorn_web/run b/conf/init/service/interactive/gunicorn_web/run
similarity index 100%
rename from conf/init/service/gunicorn_web/run
rename to conf/init/service/interactive/gunicorn_web/run
diff --git a/conf/init/service/jwtproxy/log/run b/conf/init/service/interactive/jwtproxy/log/run
similarity index 100%
rename from conf/init/service/jwtproxy/log/run
rename to conf/init/service/interactive/jwtproxy/log/run
diff --git a/conf/init/service/jwtproxy/run b/conf/init/service/interactive/jwtproxy/run
similarity index 100%
rename from conf/init/service/jwtproxy/run
rename to conf/init/service/interactive/jwtproxy/run
diff --git a/conf/init/service/nginx/log/run b/conf/init/service/interactive/nginx/log/run
similarity index 100%
rename from conf/init/service/nginx/log/run
rename to conf/init/service/interactive/nginx/log/run
diff --git a/conf/init/service/nginx/run b/conf/init/service/interactive/nginx/run
similarity index 100%
rename from conf/init/service/nginx/run
rename to conf/init/service/interactive/nginx/run
diff --git a/conf/init/service/prometheus-aggregator/log/run b/conf/init/service/interactive/prometheus-aggregator/log/run
similarity index 100%
rename from conf/init/service/prometheus-aggregator/log/run
rename to conf/init/service/interactive/prometheus-aggregator/log/run
diff --git a/conf/init/service/prometheus-aggregator/run b/conf/init/service/interactive/prometheus-aggregator/run
similarity index 100%
rename from conf/init/service/prometheus-aggregator/run
rename to conf/init/service/interactive/prometheus-aggregator/run
diff --git a/conf/init/service/servicekeyworker/log/run b/conf/init/service/interactive/servicekeyworker/log/run
similarity index 100%
rename from conf/init/service/servicekeyworker/log/run
rename to conf/init/service/interactive/servicekeyworker/log/run
diff --git a/conf/init/service/servicekeyworker/run b/conf/init/service/interactive/servicekeyworker/run
similarity index 100%
rename from conf/init/service/servicekeyworker/run
rename to conf/init/service/interactive/servicekeyworker/run
diff --git a/conf/init/service/syslog-ng/check b/conf/init/service/interactive/syslog-ng/check
similarity index 100%
rename from conf/init/service/syslog-ng/check
rename to conf/init/service/interactive/syslog-ng/check