diff --git a/tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh b/tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh
index 53ef60f544..9494210250 100755
--- a/tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh
+++ b/tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh
@@ -24,5 +24,5 @@ cat << EOF > /var/lib/awx/rsyslog/rsyslog.conf
 action(type="omfile" file="/dev/null")
 EOF
 
-exec supervisord -c /etc/supervisor_rsyslog.conf
+exec supervisord -c /etc/supervisord_rsyslog.conf
 
diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
index 3c24dd30cb..3ff4222ebe 100644
--- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
+++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
@@ -221,7 +221,7 @@ ADD tools/ansible/roles/dockerfile/files/launch_awx_task.sh /usr/bin/launch_awx_
 ADD tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh /usr/bin/launch_awx_rsyslog.sh
 ADD {{ template_dest }}/supervisor_web.conf /etc/supervisord_web.conf
 ADD {{ template_dest }}/supervisor_task.conf /etc/supervisord_task.conf
-ADD {{ template_dest }}/supervisor_rsyslog.conf /etc/supervisor_rsyslog.conf
+ADD {{ template_dest }}/supervisor_rsyslog.conf /etc/supervisord_rsyslog.conf
 {% endif %}
 {% if (build_dev|bool) or (kube_dev|bool) %}
 ADD tools/docker-compose/awx.egg-link /tmp/awx.egg-link
diff --git a/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2 b/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2
index 6826611e8b..9d14a45621 100644
--- a/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2
+++ b/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2
@@ -3,7 +3,7 @@ nodaemon = True
 umask = 022
 logfile = /dev/stdout
 logfile_maxbytes = 0
-pidfile = /var/run/supervisor/supervisor.pid
+pidfile = /var/run/supervisor/supervisor.task.pid
 
 [program:dispatcher]
 {% if kube_dev | bool %}
@@ -70,10 +70,10 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [unix_http_server]
-file=/var/run/supervisor/supervisor.sock
+file=/var/run/supervisor/supervisor.task.sock
 
 [supervisorctl]
-serverurl=unix:///var/run/supervisor/supervisor.sock ; use a unix:// URL  for a unix socket
+serverurl=unix:///var/run/supervisor/supervisor.task.sock ; use a unix:// URL  for a unix socket
 
 [rpcinterface:supervisor]
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
diff --git a/tools/ansible/roles/dockerfile/templates/supervisor_web.conf.j2 b/tools/ansible/roles/dockerfile/templates/supervisor_web.conf.j2
index 75b536cd3f..a752862537 100644
--- a/tools/ansible/roles/dockerfile/templates/supervisor_web.conf.j2
+++ b/tools/ansible/roles/dockerfile/templates/supervisor_web.conf.j2
@@ -29,8 +29,8 @@ environment =
     DEV_RELOAD_COMMAND='supervisorctl -c /etc/supervisord_task.conf restart all; supervisorctl restart tower-processes:daphne'
 {% else %}
 command = /var/lib/awx/venv/awx/bin/uwsgi /etc/tower/uwsgi.ini
-{% endif %}
 directory = /var/lib/awx
+{% endif %}
 autorestart = true
 startsecs = 30
 stopasgroup=true
@@ -76,7 +76,7 @@ stderr_logfile_maxbytes=0
 
 [program:awx-cache-clear]
 {% if kube_dev | bool %}
-command = make cache_clear
+command = make run-cache-clear
 directory = /awx_devel
 {% else %}
 command = awx-manage run_cache_clear