diff --git a/etc/ops-files.service b/etc/ops-files.service
index 1db011c..71153cd 100644
--- a/etc/ops-files.service
+++ b/etc/ops-files.service
@@ -1,14 +1,28 @@
 [Unit]
-Description=Files Service
-After=network.target
+Description=OPS Files Service
+Wants=network-online.target
+Requires=ops-visual.service
+After=network-online.target ops-visual.service
+PartOf=ops-stack.target
 
 [Service]
 Type=simple
-User=ops
-WorkingDirectory=/opt/ops/files
-ExecStart=/opt/ops/files/ops-files
+WorkingDirectory=/data/app
+EnvironmentFile=/data/app/etc/ops.env
+Environment=BSM_RuntimeMode=prod
+Environment=RUN_MODE=prod
+Environment=BSM_Prefix=/data/app
+ExecStart=/data/app/ops-files
+ExecStartPost=/data/app/systemd/wait-http.sh ops-files http://127.0.0.1:12452/Files/v1/ping/hello 60
 Restart=on-failure
 RestartSec=5s
+TimeoutStartSec=75s
+TimeoutStopSec=30s
+KillSignal=SIGTERM
+StandardOutput=journal
+StandardError=journal
+SyslogIdentifier=ops-files
+LimitNOFILE=1048576
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=ops-stack.target