diff --git a/ansible/files/adminapi.service.j2 b/ansible/files/adminapi.service.j2
index 3b2821984..ed5a5b39b 100644
--- a/ansible/files/adminapi.service.j2
+++ b/ansible/files/adminapi.service.j2
@@ -1,5 +1,11 @@
 [Unit]
 Description=AdminAPI
+Requires=network-online.target
+After=network-online.target pgbouncer.service
+
+# Move this to the Service section if on systemd >=250
+StartLimitIntervalSec=60
+StartLimitBurst=10
 
 [Service]
 Type=simple
@@ -7,10 +13,13 @@ ExecStart=/opt/supabase-admin-api
 User=adminapi
 Restart=always
 RestartSec=3
+TimeoutStopSec=10
 Environment="AWS_USE_DUALSTACK_ENDPOINT=true"
 {% if qemu_mode is defined and qemu_mode %}
 Environment="AWS_SDK_LOAD_CONFIG=true"
 {% endif %}
+StandardOutput=journal
+StandardError=journal
 
 [Install]
 WantedBy=multi-user.target