diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 7f035564b8..f52aa36832 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -71,7 +71,7 @@ DATABASES = {
 # timezone as the operating system.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
-TIME_ZONE = None
+TIME_ZONE = 'UTC'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
@@ -213,11 +213,11 @@ TEMPLATES = [
                 'social_django.context_processors.backends',
                 'social_django.context_processors.login_redirect',
             ],
-            'loaders': [
+            'loaders': [(
                 'django.template.loaders.cached.Loader',
-                'django.template.loaders.filesystem.Loader',
-                'django.template.loaders.app_directories.Loader',
-            ],
+                ('django.template.loaders.filesystem.Loader',
+                'django.template.loaders.app_directories.Loader',),
+            )],
         },
         'DIRS': [
             os.path.join(BASE_DIR, 'templates'),
@@ -232,7 +232,6 @@ MIDDLEWARE_CLASSES = (  # NOQA
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
     'awx.main.middleware.ActivityStreamMiddleware',
     'awx.sso.middleware.SocialAuthMiddleware',
     'crum.CurrentRequestUserMiddleware',
diff --git a/installer/image_build/files/supervisor_task.conf b/installer/image_build/files/supervisor_task.conf
index 3154c7ffb1..857f941c96 100644
--- a/installer/image_build/files/supervisor_task.conf
+++ b/installer/image_build/files/supervisor_task.conf
@@ -4,7 +4,7 @@ umask = 022
 
 [program:celery]
 # TODO: Needs to be reworked to dynamically use instance group queues
-command = awx-manage celery worker -l debug --autoscale=4 -Ofair -Q tower_scheduler,tower_broadcast_all,tower,%(host_node_name)s -n celery@localhost
+command = /var/lib/awx/venv/awx/bin/celery worker -A awx -l debug --autoscale=4 -Ofair -Q tower_scheduler,tower_broadcast_all,tower,%(host_node_name)s -n celery@localhost
 directory = /var/lib/awx
 environment = LANGUAGE="en_US.UTF-8",LANG="en_US.UTF-8",LC_ALL="en_US.UTF-8",LC_CTYPE="en_US.UTF-8"
 #user = {{ aw_user }}
@@ -17,7 +17,7 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [program:awx-celeryd-beat]
-command = /usr/bin/awx-manage celery beat -l debug --pidfile= -s /var/lib/awx/beat.db
+command = /var/lib/awx/venv/awx/bin/celery beat -A awx -l debug --pidfile= -s /var/lib/awx/beat.db
 directory = /var/lib/awx
 autostart = true
 autorestart = true