diff --git a/arangod/Agency/AgencyFeature.cpp b/arangod/Agency/AgencyFeature.cpp
index 1c37e33558..4feef18fda 100644
--- a/arangod/Agency/AgencyFeature.cpp
+++ b/arangod/Agency/AgencyFeature.cpp
@@ -46,7 +46,7 @@ AgencyFeature::AgencyFeature(application_features::ApplicationServer* server)
       _waitForSync(true),
       _supervisionFrequency(5.0),
       _compactionStepSize(1000),
-      _supervisionGracePeriod(120.0),
+      _supervisionGracePeriod(15.0),
       _cmdLineTimings(false)
 {
   setOptional(true);
diff --git a/arangod/Agency/AgentConfiguration.cpp b/arangod/Agency/AgentConfiguration.cpp
index 7e10341c18..f7bab67c71 100644
--- a/arangod/Agency/AgentConfiguration.cpp
+++ b/arangod/Agency/AgentConfiguration.cpp
@@ -38,7 +38,7 @@ config_t::config_t()
       _waitForSync(true),
       _supervisionFrequency(5.0),
       _compactionStepSize(1000),
-      _supervisionGracePeriod(120),
+      _supervisionGracePeriod(15.0),
       _cmdLineTimings(false),
       _version(0),
       _lock()
diff --git a/scripts/startStandAloneAgency.sh b/scripts/startStandAloneAgency.sh
index 04d49115c5..5441caa867 100755
--- a/scripts/startStandAloneAgency.sh
+++ b/scripts/startStandAloneAgency.sh
@@ -142,7 +142,7 @@ if [ "$GOSSIP_MODE" = "0" ]; then
    GOSSIP_PEERS=" --agency.endpoint $TRANSPORT://localhost:$BASE"
 fi
 
-#rm -rf agency
+rm -rf agency
 mkdir -p agency
 PIDS=""
 
@@ -179,7 +179,7 @@ for aid in "${aaid[@]}"; do
     --log.level agency=$LOG_LEVEL \
     --log.use-microtime $USE_MICROTIME \
     --server.authentication false \
-    --server.endpoint $TRANSPORT://localhost:$port \
+    --server.endpoint $TRANSPORT://0.0.0.0:$port \
     --server.statistics false \
     $SSLKEYFILE \
     > agency/$port.stdout 2>&1 &