diff --git a/.circleci/config.yml b/.circleci/config.yml
index 33413371..26d6ea08 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -58,6 +58,8 @@ jobs:
     steps:
       - restore_cache:
           *restore-repository-cache
+      # Captures SIGPIPE 141 error but still allow repeating "y" to accept all licenses
+      - run: yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses || if [ $? -ne '141' ]; then exit $?; fi;
       - run: *npm-link
       - run:
           name: Run tests and build android app
diff --git a/generators/app/templates/_package.json b/generators/app/templates/_package.json
index 30e79bcb..51bdc528 100644
--- a/generators/app/templates/_package.json
+++ b/generators/app/templates/_package.json
@@ -21,8 +21,8 @@
     "docs": "hads ./docs -o",
     "env": "ngx-scripts env npm_package_version",
 <% if (props.prettier) { -%>
-    "prettier": "prettier --write \"./{src,e2e}/**/*.{ts,js,scss}\"",
-    "prettier:check": "prettier --list-different \"./{src,e2e}/**/*.{ts,js,scss}\"",
+    "prettier": "prettier --write \"./{src,e2e}/**/*.{ts,js,html,scss}\"",
+    "prettier:check": "prettier --list-different \"./{src,e2e}/**/*.{ts,js,html,scss}\"",
     "postinstall": "<%= run('prettier') %>",
 <%   if (options.git) { -%>
     "precommit": "pretty-quick --staged",