diff --git a/templates/common/Gruntfile.js b/templates/common/Gruntfile.js
index a0c95567d..fd1db17b4 100644
--- a/templates/common/Gruntfile.js
+++ b/templates/common/Gruntfile.js
@@ -280,7 +280,7 @@ module.exports = function (grunt) {
         },
         files: [{
           expand: true,
-          cwd: '<%%= yeoman.app %>',
+          cwd: '<%%= yeoman.dist %>',
           src: ['*.html', 'views/*.html'],
           dest: '<%%= yeoman.dist %>'
         }]
@@ -318,6 +318,7 @@ module.exports = function (grunt) {
           src: [
             '*.{ico,png,txt}',
             '.htaccess',
+            '*.html',
             'bower_components/**/*',
             'images/{,*/}*.{webp}',
             'fonts/*'