diff --git a/heron/config/src/yaml/conf/aurora/heron.aurora b/heron/config/src/yaml/conf/aurora/heron.aurora
index d32c83bc416..d939fa83690 100644
--- a/heron/config/src/yaml/conf/aurora/heron.aurora
+++ b/heron/config/src/yaml/conf/aurora/heron.aurora
@@ -79,7 +79,7 @@ jobs = [
     service = True,
     task = heron_task,
     instances = '{{NUM_CONTAINERS}}',
-    announce = Announcer(primary_port = 'http', portmap = {'health': 'http'}),
+    announce = Announcer(primary_port = 'http', portmap = {'admin': 'http', 'health': 'http'}),
     health_check_config = HealthCheckConfig(
       health_checker = HealthCheckerConfig(
         http = HttpHealthChecker(endpoint='/health', expected_response='ok', expected_response_code=200)
diff --git a/heron/shell/src/python/main.py b/heron/shell/src/python/main.py
index c476eca56e7..9705e7cd536 100644
--- a/heron/shell/src/python/main.py
+++ b/heron/shell/src/python/main.py
@@ -41,6 +41,8 @@
     (r"^/filestats/(.*)", handlers.FileStatsHandler),
     (r"^/download/(.*)", handlers.DownloadHandler),
     (r"^/killexecutor", handlers.KillExecutorHandler),
+    (r"^/quitquitquit", handlers.KillExecutorHandler),
+    (r"^/abortabortabort", handlers.KillExecutorHandler),
     (r"^/health", handlers.HealthHandler),
 ]