diff --git a/roles/minio/templates/minio.container.j2 b/roles/minio/templates/minio.container.j2
index dcc7295..7f173b3 100644
--- a/roles/minio/templates/minio.container.j2
+++ b/roles/minio/templates/minio.container.j2
@@ -1,7 +1,7 @@
 [Unit]
 Description=MinIO Object Storage
-Wants=network.target
-After=network.target
+Wants=network-online.target
+After=network-online.target
 
 [Container]
 Image={{ minio_container_image }}:{{ minio_version }}
@@ -16,6 +16,8 @@ NoNewPrivileges=yes
 
 [Service]
 ExecReload=/bin/kill -HUP $MAINPID
+TimeoutStartSec=5min
+Restart=always
 MemoryDenyWriteExecute=yes
 PrivateTmp=yes
 ProtectClock=yes