diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index f4e175fb8..a4965ac6c 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -95,7 +95,7 @@ gulp.task('styles', () => {
     .pipe($.autoprefixer(AUTOPREFIXER_BROWSERS))
     .pipe(gulp.dest('.tmp/styles'))
     // Concatenate and minify styles
-    .pipe($.if('*.css', $.minifyCss()))
+    .pipe($.if('*.css', $.cssnano()))
     .pipe($.size({title: 'styles'}))
     .pipe($.sourcemaps.write('./'))
     .pipe(gulp.dest('dist/styles'));
@@ -140,10 +140,20 @@ gulp.task('html', () => {
 
     // Concatenate and minify styles
     // In case you are still using useref build blocks
-    .pipe($.if('*.css', $.minifyCss()))
+    .pipe($.if('*.css', $.cssnano()))
 
     // Minify any HTML
-    .pipe($.if('*.html', $.minifyHtml()))
+    .pipe($.if('*.html', $.htmlmin({
+      removeComments: true,
+      collapseWhitespace: true,
+      collapseBooleanAttributes: true,
+      removeAttributeQuotes: true,
+      removeRedundantAttributes: true,
+      removeEmptyAttributes: true,
+      removeScriptTypeAttributes: true,
+      removeStyleLinkTypeAttributes: true,
+      removeOptionalTags: true
+    })))
     // Output files
     .pipe($.if('*.html', $.size({title: 'html', showFiles: true})))
     .pipe(gulp.dest('dist'));
diff --git a/package.json b/package.json
index c8cbc02f2..c401f4050 100644
--- a/package.json
+++ b/package.json
@@ -11,12 +11,12 @@
     "gulp-babel": "^6.0.0",
     "gulp-cache": "0.2.2",
     "gulp-concat": "^2.5.2",
+    "gulp-cssnano": "^2.0.0",
     "gulp-eslint": "^1.0.0",
+    "gulp-htmlmin": "^1.3.0",
     "gulp-if": "^2.0.0",
     "gulp-imagemin": "^2.0.0",
     "gulp-load-plugins": "^1.0.0",
-    "gulp-minify-css": "^1.1.6",
-    "gulp-minify-html": "^1.0.4",
     "gulp-newer": "^1.0.0",
     "gulp-sass": "^2.0.0",
     "gulp-size": "^2.0.0",