diff --git a/script/build_frontend b/script/build_frontend
index f687c10a31c..7ce2dfb77e1 100755
--- a/script/build_frontend
+++ b/script/build_frontend
@@ -13,13 +13,14 @@ rm -rf homeassistant/components/frontend/www_static/core.js* \
        homeassistant/components/frontend/www_static/webcomponents-lite.min.js* \
        homeassistant/components/frontend/www_static/panels
 cd homeassistant/components/frontend/www_static/home-assistant-polymer
-npm run clean
 
 # Build frontend
-npm run frontend_prod
+BUILD_DEV=0 gulp
 cp bower_components/webcomponentsjs/webcomponents-lite.min.js ..
-cp -r build/* ..
-BUILD_DEV=0 node script/gen-service-worker.js
+cp build/*.js build/*.html ..
+mkdir ../panels
+cp build/panels/*.html ../panels
+BUILD_DEV=0 gulp gen-service-worker
 cp build/service_worker.js ..
 cd ..