diff --git a/Gruntfile.js b/Gruntfile.js
index 26dba52a..f71c101d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -288,21 +288,21 @@ module.exports = function (grunt) {
         dest: 'docs/_plugins/'
       },
 
-      'bs-docs-scss': {
-        options: {
-          // https://regex101.com/r/hG8lU4/1
-          process: function (content, srcpath) {
-            return content.replace(/([\s\S]+)/mg, '// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs\n\n$1');
-          }
-        },
-        expand: true,
-        cwd: '../bootstrap/docs/assets/scss',
-        src: [
-          '**/*',
-          '!docs.scss' // keep variable customizations
-        ],
-        dest: 'docs/assets/scss/'
-      },
+      //'bs-docs-scss': {
+      //  options: {
+      //    // https://regex101.com/r/hG8lU4/1
+      //    process: function (content, srcpath) {
+      //      return content.replace(/([\s\S]+)/mg, '// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs\n\n$1');
+      //    }
+      //  },
+      //  expand: true,
+      //  cwd: '../bootstrap/docs/assets/scss',
+      //  src: [
+      //    '**/*',
+      //    '!docs.scss' // keep variable customizations
+      //  ],
+      //  dest: 'docs/assets/scss/'
+      //},
       //'bs-docs-components': {
       //  options: {
       //    // //https://regex101.com/r/cZ7aO8/2
diff --git a/docs/assets/scss/_ads.scss b/docs/assets/scss/_ads.scss
index 6c7ca977..e1124f1f 100644
--- a/docs/assets/scss/_ads.scss
+++ b/docs/assets/scss/_ads.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 // scss-lint:disable ImportantRule
 
diff --git a/docs/assets/scss/_anchor.scss b/docs/assets/scss/_anchor.scss
index edb1884a..efaf0e2b 100644
--- a/docs/assets/scss/_anchor.scss
+++ b/docs/assets/scss/_anchor.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 .anchorjs-link {
   color: inherit;
diff --git a/docs/assets/scss/_booticon.scss b/docs/assets/scss/_booticon.scss
index 48f2b47c..a6bd2bb4 100644
--- a/docs/assets/scss/_booticon.scss
+++ b/docs/assets/scss/_booticon.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 //
 // Bootstrap "B" Booticon
diff --git a/docs/assets/scss/_brand.scss b/docs/assets/scss/_brand.scss
index 9d403a41..4bf97b07 100644
--- a/docs/assets/scss/_brand.scss
+++ b/docs/assets/scss/_brand.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 //
 // Brand guidelines
diff --git a/docs/assets/scss/_browser-bugs.scss b/docs/assets/scss/_browser-bugs.scss
index 72ce6f63..41d65a22 100644
--- a/docs/assets/scss/_browser-bugs.scss
+++ b/docs/assets/scss/_browser-bugs.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 // Wall of Browser Bugs
 //
diff --git a/docs/assets/scss/_buttons.scss b/docs/assets/scss/_buttons.scss
index 4ff0c9db..c2c76d62 100644
--- a/docs/assets/scss/_buttons.scss
+++ b/docs/assets/scss/_buttons.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 // Buttons
 //
diff --git a/docs/assets/scss/_callouts.scss b/docs/assets/scss/_callouts.scss
index 0a3b2900..354b9c03 100644
--- a/docs/assets/scss/_callouts.scss
+++ b/docs/assets/scss/_callouts.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 //
 // Callouts
diff --git a/docs/assets/scss/_clipboard-js.scss b/docs/assets/scss/_clipboard-js.scss
index a5507f4b..5300df6f 100644
--- a/docs/assets/scss/_clipboard-js.scss
+++ b/docs/assets/scss/_clipboard-js.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 // clipboard.js
 //
diff --git a/docs/assets/scss/_component-examples.scss b/docs/assets/scss/_component-examples.scss
index 4981d9df..7001d551 100644
--- a/docs/assets/scss/_component-examples.scss
+++ b/docs/assets/scss/_component-examples.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 // scss-lint:disable QualifyingElement
 
diff --git a/docs/assets/scss/_content.scss b/docs/assets/scss/_content.scss
index 647c2ff9..aa3dbe50 100644
--- a/docs/assets/scss/_content.scss
+++ b/docs/assets/scss/_content.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 // scss-lint:disable IdSelector, NestingDepth, SelectorDepth
 
diff --git a/docs/assets/scss/_examples.scss b/docs/assets/scss/_examples.scss
index 55f5fb1a..ad53e374 100644
--- a/docs/assets/scss/_examples.scss
+++ b/docs/assets/scss/_examples.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 //
 // Examples
diff --git a/docs/assets/scss/_featured-sites.scss b/docs/assets/scss/_featured-sites.scss
index 0985ae67..6c421ced 100644
--- a/docs/assets/scss/_featured-sites.scss
+++ b/docs/assets/scss/_featured-sites.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 .bd-featured-sites {
   margin-right: -1px;
diff --git a/docs/assets/scss/_featurettes.scss b/docs/assets/scss/_featurettes.scss
index 6e4601f2..5c6e645e 100644
--- a/docs/assets/scss/_featurettes.scss
+++ b/docs/assets/scss/_featurettes.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 .bd-featurette {
   padding-top: 3rem;
diff --git a/docs/assets/scss/_footer.scss b/docs/assets/scss/_footer.scss
index cbd4e5a3..2b44b06b 100644
--- a/docs/assets/scss/_footer.scss
+++ b/docs/assets/scss/_footer.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 //
 // Footer
diff --git a/docs/assets/scss/_masthead.scss b/docs/assets/scss/_masthead.scss
index 3049e88d..c9805e5c 100644
--- a/docs/assets/scss/_masthead.scss
+++ b/docs/assets/scss/_masthead.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 // scss-lint:disable ImportantRule
 
diff --git a/docs/assets/scss/_nav.scss b/docs/assets/scss/_nav.scss
index c3a1925f..642e9a39 100644
--- a/docs/assets/scss/_nav.scss
+++ b/docs/assets/scss/_nav.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 //
 // Main navbar
diff --git a/docs/assets/scss/_page-header.scss b/docs/assets/scss/_page-header.scss
index c17867b5..be3115ac 100644
--- a/docs/assets/scss/_page-header.scss
+++ b/docs/assets/scss/_page-header.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 // scss-lint:disable ImportantRule
 
diff --git a/docs/assets/scss/_responsive-tests.scss b/docs/assets/scss/_responsive-tests.scss
index 21927ce1..414ecb16 100644
--- a/docs/assets/scss/_responsive-tests.scss
+++ b/docs/assets/scss/_responsive-tests.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 // scss-lint:disable ImportantRule
 
diff --git a/docs/assets/scss/_sidebar.scss b/docs/assets/scss/_sidebar.scss
index 7073a757..29f6e6e9 100644
--- a/docs/assets/scss/_sidebar.scss
+++ b/docs/assets/scss/_sidebar.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 //
 // Side navigation
diff --git a/docs/assets/scss/_skiplink.scss b/docs/assets/scss/_skiplink.scss
index d71aa872..7f4ae3d3 100644
--- a/docs/assets/scss/_skiplink.scss
+++ b/docs/assets/scss/_skiplink.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 // scss-lint:disable IdSelector
 
diff --git a/docs/assets/scss/_syntax.scss b/docs/assets/scss/_syntax.scss
index 1a5a3836..403a41de 100644
--- a/docs/assets/scss/_syntax.scss
+++ b/docs/assets/scss/_syntax.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 .hll { background-color: #ffc; }
 .c { color: #999; }
diff --git a/docs/assets/scss/_team.scss b/docs/assets/scss/_team.scss
index 932926ef..22b7f810 100644
--- a/docs/assets/scss/_team.scss
+++ b/docs/assets/scss/_team.scss
@@ -1,4 +1,4 @@
-// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs
+// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs
 
 .bd-team {
   margin-bottom: 1.5rem;
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 927ceda4..5287ba62 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -171,16 +171,6 @@ let bsDocs = [
     process: docsProcess
   }),
 
-  //new Copy(gulp, docsPreset, docsConfig, {
-  //  task: {name: 'copy:bs-docs-getting-started'},
-  //  source: {
-  //    options: {cwd: '../bootstrap/docs/getting-started'},
-  //    glob: ['**/*']
-  //  },
-  //  dest: 'docs/getting-started/',
-  //  process: docsProcess
-  //}),
-
   new Copy(gulp, docsPreset, docsConfig, {
     task: {name: 'copy:bs-docs-components'},
     source: {
@@ -190,6 +180,22 @@ let bsDocs = [
     dest: 'docs/components/',
     process: docsProcess
   }),
+
+  new Copy(gulp, docsPreset, docsConfig, {
+    task: {name: 'copy:bs-docs-scss'},
+    source: {
+      options: {cwd: '../bootstrap/docs/assets/scss'},
+      glob: [
+          '**/*',
+          '!docs.scss' // keep variable customizations
+        ]
+    },
+    dest: 'docs/assets/scss/',
+    process: (content, srcpath) => {
+      return content.replace(/([\s\S]+)/mg, '// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by gulp docs:copy-bs\n\n$1');
+    }
+  }),
 ]
 
-new TaskSeries(gulp, 'bsDocs', bsDocs)
+
+new TaskSeries(gulp, 'docs:copy-bs', bsDocs)