diff --git a/.gitignore b/.gitignore
index e9b00f53d3..1160400a8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ tar-build
 
 # JavaScript
 /Gruntfile.js
+/Brocfile.js
 /bower.json
 /package.json
 node_modules/**
diff --git a/Brocfile.js b/Brocfile.js
deleted file mode 100644
index 37408d022f..0000000000
--- a/Brocfile.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/* jshint node: true */
-
-var flatten = require('lodash/array/flatten');
-var isUndefined = require('lodash/lang/isUndefined');
-var path = require('path');
-var parseArgs = require('minimist');
-var mergeTrees = require('broccoli-merge-trees');
-var uglifyFiles = require('broccoli-uglify-sourcemap');
-var concatFiles = require('broccoli-sourcemap-concat');
-var compileLess = require('broccoli-less-single');
-var gzip = require('broccoli-gzip');
-var debug = require('broccoli-stew').debug;
-var ES6 = require('broccoli-es6modules');
-var Funnel = require('broccoli-funnel');
-
-// Get extra args after '--'
-var allArgs = parseArgs(process.argv.slice(2), { '--': true });
-var args = parseArgs(allArgs['--']);
-
-var shouldCompress = isUndefined(args.compress) ? false : args.compress;
-var debugMode = isUndefined(args.debug) ? false : args.debug;
-var silentMode = isUndefined(args.silent) ? false : args.silent;
-var includeTests = isUndefined(args.tests) ? true : args.tests;
-
-var appName = 'tower';
-
-if (debugMode) {
-    log('*** DEBUG MODE ***');
-}
-
-var vendorFiles =
-    [ 'loader.js/loader.js',
-      'jquery/dist/jquery.js',
-      'angular/angular.js',
-      'angular-route/angular-route.js',
-      'angular-resource/angular-resource.js',
-      'angular-cookies/angular-cookies.js',
-      'angular-sanitize/angular-sanitize.js',
-      'angular-md5/angular-md5.js',
-      'jquery-ui/jquery-ui.js',
-      'bootstrap/dist/js/bootstrap.js',
-      'js-yaml/dist/js-yaml.js',
-      'select2/select2.js',
-      'angular-animate/angular-animate.js',
-      'angular-tz-extensions/packages/jstimezonedetect/jstz.js',
-      'socket.io-client/dist/socket.io.js',
-      'd3/d3.js',
-      'novus-nvd3/nv.d3.js',
-      'angular-codemirror/lib/AngularCodeMirror.js',
-      'timezone-js/src/date.js',
-      'underscore/underscore.js',
-      'rrule/lib/rrule.js',
-      'rrule/lib/nlp.js',
-      'angular-tz-extensions/lib/angular-tz-extensions.js',
-      'angular-scheduler/lib/angular-scheduler.js',
-      'angular-filters/dist/angular-filters.js',
-      'bootstrap/dist/js/bootstrap.js',
-      'codemirror/lib/codemirror.js',
-      'd3Donut/d3Donut.js',
-      'jPushMenu/jPushMenu.js',
-      'jQuery.dotdotdot/src/js/jquery.dotdotdot.js',
-      'jquery-ui/jquery-ui.js',
-      'js-yaml/dist/js-yaml.js',
-      'lrInfiniteScroll/lrInfiniteScroll.js',
-      'scrollto/lib/jquery-scrollto.js',
-      'select2/select2.js',
-      'sizzle/dist/sizzle.js',
-      'ansible/*.js'
-    ];
-
-var testFiles =
-    [   'tests/helpers.js',
-        'tests/unit/**/*.js'
-    ];
-
-function log() {
-    var msgs = Array.prototype.slice.apply(arguments);
-
-    if (!silentMode) {
-        console.log.apply(null, msgs);
-    }
-
-    return msgs.slice(-1);
-}
-
-function doDebug(name, tree) {
-    if (debugMode) {
-        tree = debug(tree, { name: name });
-    }
-
-    return tree;
-}
-
-function prependLibDir(file) {
-    return path.join('lib', file);
-}
-
-vendorFiles = vendorFiles.map(prependLibDir);
-
-var root = 'awx/ui/static';
-var app = new Funnel(root,
-                       { include: flatten([vendorFiles, 'js/**/*.js'])
-                       });
-
-app = doDebug('initial-select', app);
-
-var appStyles = new Funnel(root,
-                           { include: ['**/*.less']
-                           });
-
-var applicationJS = new Funnel(app,
-                     {   include: ['**/*.js'],
-                         srcDir: 'js',
-                         destDir: appName
-                     });
-
-applicationJS = doDebug('app-funnel', applicationJS);
-
-var vendorJS = new Funnel(app,
-                          { include: ['lib/**/*.js']
-                          });
-
-vendorJS = doDebug('vendor-funnel', vendorJS);
-
-applicationJS = new ES6(applicationJS);
-
-app = mergeTrees([vendorJS, applicationJS]);
-
-app = doDebug('merged-app-vendor', app);
-
-app = concatFiles(app,
-        {   outputFile: 'tower.concat.js',
-            inputFiles: flatten([vendorFiles, ['tower/**/*.js', 'tower/app.js', 'tower/config.js', 'tower/local_config.js']])
-        });
-
-app = doDebug('concat', app);
-
-var styles = compileLess(appStyles, 'less/ansible-ui.less', 'tower.min.css');
-
-app = mergeTrees([app, styles]);
-
-if (includeTests) {
-    var tests = new Funnel('awx/ui',
-                            {   include: ['tests/unit/**/*.js']
-
-                            });
-
-    tests = doDebug('tests-funnel', tests);
-    tests = new ES6(tests);
-    app = mergeTrees([app, tests]);
-    app = doDebug('merge-tests', app);
-}
-
-if (shouldCompress) {
-    app = uglifyFiles(app);
-    app = gzip(app,
-                {   keepUncompressed: true,
-                    extensions: ['js', 'css']
-                });
-}
-
-module.exports = app;
diff --git a/Makefile b/Makefile
index 55af60fbdd..d57efb31be 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ clean-deb:
 
 # Remove grunt build files
 clean-grunt:
-	rm -f package.json Gruntfile.js bower.json
+	rm -f package.json Gruntfile.js Brocfile.js bower.json
 	rm -rf node_modules
 
 # Remove UI build files
@@ -262,6 +262,9 @@ test_jenkins:
 Gruntfile.js:
 	cp packaging/grunt/$@ $@
 
+Brocfile.js:
+	cp packaging/grunt/$@ $@
+
 bower.json:
 	cp packaging/grunt/$@ $@
 
@@ -269,7 +272,7 @@ package.json:
 	sed -e 's#%NAME%#$(NAME)#;s#%VERSION%#$(VERSION)#;s#%GIT_REMOTE_URL%#$(GIT_REMOTE_URL)#;' packaging/grunt/package.template > $@
 
 # Update local npm install
-node_modules: Gruntfile.js bower.json package.json
+node_modules: Gruntfile.js Brocfile.js bower.json package.json
 	npm install
 
 devjs: node_modules clean-ui