diff --git a/docker-compose.yml b/docker-compose.yml
index a8499abd7f77fc51772013d50c08ab208927ef3b..cb6c0656e9c213f94305a399cf406fdd56917a83 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,10 +4,11 @@ services:
     build: .
     image: iics_secure_agent
     hostname: "${HOSTNAME}" # Agent name that will show up in the IICS Admin Dashboard
-    environment:            # Values can be set in the .env file
+    stop_grace_period: 5m   # Takes a long time to shutdown gracefully, otherwise Docker will kill it
+    environment:            # Values can be set in a .env file or passed in at runtime
       INFORMATICA_USER:
       INFORMATICA_PASSWORD:
-      JSON_LOG: "true"
-    volumes:
-      # - ./volumes/infaagent.ini:/home/infaagent/apps/agentcore/conf/infaagent.ini
-      - ./volumes/export:/export
+      # JSON_LOG: "true"
+    # volumes:
+    #   - ./volumes/infaagent.ini:/home/infaagent/apps/agentcore/conf/infaagent.ini
+    #   - ./volumes/export:/export