diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index a8e9e0a6ed..9134621662 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -298,7 +298,7 @@ TEMPLATES = [
             os.path.join(BASE_DIR, 'templates'),
             os.path.join(BASE_DIR, 'ui', 'build'),
             os.path.join(BASE_DIR, 'ui', 'public'),
-            os.path.join(BASE_DIR, 'ui_next', 'build', 'media'),
+            os.path.join(BASE_DIR, 'ui_next', 'build', 'awx'),
         ],
     },
 ]
diff --git a/awx/ui_next/Makefile b/awx/ui_next/Makefile
index cc1f665e37..6fed498d5f 100644
--- a/awx/ui_next/Makefile
+++ b/awx/ui_next/Makefile
@@ -78,6 +78,7 @@ ui_next/src:
 $(UI_NEXT_SRC_DIR):
 	$(MAKE) ui_next/src
 
+## Alias for ui_next/build, will not run if ui_next/src/build already exist
 $(UI_NEXT_SRC_DIR)/build:
 	$(MAKE) ui_next/src/build
 
@@ -100,10 +101,10 @@ $(UI_NEXT_SRC_DIR)/node_modules/webpack:
 	$(MAKE) ui_next/src/node_modules/webpack
 
 ## Copy ui_next/src/build to ui_next/build
-ui_next/build:
+ui_next/build: ui_next/clean/build
 	$(MAKE) $(UI_NEXT_SRC_DIR)/build
-	@mkdir $(UI_NEXT_DIR_ABS)/build && \
-	cp -r $(UI_NEXT_SRC_DIR)/build/awx $(UI_NEXT_DIR_ABS)/build/media &&\
+	@mkdir $(UI_NEXT_DIR_ABS)build && \
+	cp -r $(UI_NEXT_SRC_DIR)/build/awx $(UI_NEXT_DIR_ABS)build/awx &&\
 	touch $(UI_NEXT_BUILT_FILE)
 
 ## Alias for ui_next/build. Will not run if .ui-built file already exist