diff --git a/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 b/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2
index a79606951b..95a25971aa 100644
--- a/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2
+++ b/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2
@@ -12,9 +12,10 @@ directory = /awx_devel
 {% else %}
 command = nginx -g "daemon off;"
 {% endif %}
-autostart = true
 autorestart = true
-stopwaitsecs = 5
+startsecs = 30
+stopasgroup=true
+killasgroup=true
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
@@ -31,12 +32,10 @@ environment =
 command = /var/lib/awx/venv/awx/bin/uwsgi /etc/tower/uwsgi.ini
 directory = /var/lib/awx
 {% endif %}
-autostart = true
 autorestart = true
-stopwaitsecs = 15
+startsecs = 30
 stopasgroup=true
 killasgroup=true
-stopsignal=KILL
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
@@ -50,10 +49,8 @@ directory = /awx_devel
 command = /var/lib/awx/venv/awx/bin/daphne -b 127.0.0.1 -p 8051 --websocket_timeout -1 awx.asgi:channel_layer
 directory = /var/lib/awx
 {% endif %}
-autostart = true
-stopsignal=KILL
 autorestart = true
-stopwaitsecs = 5
+startsecs = 30
 stopasgroup=true
 killasgroup=true
 stdout_logfile=/dev/stdout
@@ -69,9 +66,8 @@ directory = /awx_devel
 command = awx-manage run_wsbroadcast
 directory = /var/lib/awx
 {% endif %}
-autostart = true
 autorestart = true
-stopwaitsecs = 5
+startsecs = 30
 stopasgroup=true
 killasgroup=true
 stdout_logfile=/dev/stdout
@@ -81,16 +77,14 @@ stderr_logfile_maxbytes=0
 
 [program:awx-rsyslogd]
 command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
-autostart = true
 autorestart = true
-startretries = 10
-stopwaitsecs = 5
-stopsignal=TERM
+startsecs = 30
 stopasgroup=true
 killasgroup=true
-redirect_stderr=true
-stdout_logfile=/dev/stderr
+stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
 
 [group:tower-processes]
 programs=nginx,uwsgi,daphne,wsbroadcast,awx-rsyslogd
@@ -98,11 +92,11 @@ priority=5
 
 [eventlistener:superwatcher]
 command=stop-supervisor
-events=PROCESS_STATE_FATAL,PROCESS_STATE_EXITED
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
+events=PROCESS_STATE_FATAL
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
 
 [unix_http_server]
 file=/var/run/supervisor/supervisor.web.sock
diff --git a/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2 b/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2
index 81f67da2c0..a2f2bd5298 100644
--- a/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2
+++ b/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2
@@ -13,9 +13,8 @@ directory = /awx_devel
 command = awx-manage run_dispatcher
 directory = /var/lib/awx
 {% endif %}
-autostart = true
 autorestart = true
-stopwaitsecs = 5
+startsecs = 30
 stopasgroup=true
 killasgroup=true
 stdout_logfile=/dev/stdout
@@ -31,9 +30,8 @@ directory = /awx_devel
 command = awx-manage run_callback_receiver
 directory = /var/lib/awx
 {% endif %}
-autostart = true
 autorestart = true
-stopwaitsecs = 5
+startsecs = 30
 stopasgroup=true
 killasgroup=true
 stdout_logfile=/dev/stdout
@@ -47,11 +45,12 @@ priority=5
 
 [eventlistener:superwatcher]
 command=stop-supervisor
-events=PROCESS_STATE_FATAL,PROCESS_STATE_EXITED
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
+events=PROCESS_STATE_FATAL
+autorestart = true
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
 
 [unix_http_server]
 file=/var/run/supervisor/supervisor.sock
diff --git a/tools/docker-compose/supervisor.conf b/tools/docker-compose/supervisor.conf
index 618197696c..0726c083fa 100644
--- a/tools/docker-compose/supervisor.conf
+++ b/tools/docker-compose/supervisor.conf
@@ -5,79 +5,75 @@ nodaemon=true
 
 [program:awx-dispatcher]
 command = make dispatcher
-autostart = true
 autorestart = true
-stopwaitsecs = 1
-stopsignal=KILL
+startsecs = 30
 stopasgroup=true
 killasgroup=true
-redirect_stderr=true
-stdout_events_enabled = true
-stderr_events_enabled = true
-
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
 
 [program:awx-receiver]
 command = make receiver
-autostart = true
 autorestart = true
-stopwaitsecs = 1
-stopsignal=KILL
+startsecs = 30
 stopasgroup=true
 killasgroup=true
-redirect_stderr=true
-stdout_events_enabled = true
-stderr_events_enabled = true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
 
 [program:awx-wsbroadcast]
 command = make wsbroadcast
-autostart = true
 autorestart = true
-stopwaitsecs = 1
-stopsignal=KILL
+startsecs = 30
+autorestart = true
 stopasgroup=true
 killasgroup=true
-redirect_stderr=true
-stdout_events_enabled = true
-stderr_events_enabled = true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
 
 [program:awx-uwsgi]
 command = make uwsgi
-autostart = true
 autorestart = true
-redirect_stderr=true
-stopwaitsecs = 1
-stopsignal=KILL
+startsecs = 30
 stopasgroup=true
 killasgroup=true
-stdout_events_enabled = true
-stderr_events_enabled = true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
 
 [program:awx-daphne]
 command = make daphne
-autostart = true
 autorestart = true
-redirect_stderr=true
-stopwaitsecs = 1
-stopsignal=KILL
+startsecs = 30
 stopasgroup=true
 killasgroup=true
-stdout_events_enabled = true
-stderr_events_enabled = true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
 
 [program:awx-nginx]
 command = make nginx
-autostart = true
 autorestart = true
-redirect_stderr=true
-stdout_events_enabled = true
-stderr_events_enabled = true
+startsecs = 30
+stopasgroup=true
+killasgroup=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
 
 [program:awx-rsyslogd]
 command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
-autostart = true
 autorestart = true
-stopwaitsecs = 5
-stopsignal=TERM
+startsecs = 30
 stopasgroup=true
 killasgroup=true
 redirect_stderr=true
@@ -86,14 +82,14 @@ stderr_events_enabled = true
 
 [program:awx-receptor]
 command = receptor --config /etc/receptor/receptor.conf
-autostart = true
 autorestart = true
-stopsignal = KILL
-stopasgroup = true
-killasgroup = true
-redirect_stderr=true
-stdout_events_enabled = true
-stderr_events_enabled = true
+startsecs = 30
+stopasgroup=true
+killasgroup=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
 
 [group:tower-processes]
 programs=awx-dispatcher,awx-receiver,awx-uwsgi,awx-daphne,awx-nginx,awx-wsbroadcast,awx-rsyslogd
@@ -101,7 +97,8 @@ priority=5
 
 [eventlistener:superwatcher]
 command=stop-supervisor
-events=PROCESS_STATE_FATAL,PROCESS_STATE_EXITED
+events=PROCESS_STATE_FATAL
+autorestart = true
 stderr_logfile=/dev/stdout
 stderr_logfile_maxbytes=0
 stdout_logfile=/dev/stdout