diff --git a/.travis.yml b/.travis.yml
index a2d3c4e..617cf7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,21 @@
 language: node_js
 jobs:
   include:
-    - stage: lint
-      node_js: 12
-      script:
-        - yarn lint:commit-travis
-        - yarn lint
     - stage: test
-      node_js: 10
+      node_js: 8
       script:
         - yarn test
         - yarn build
-    - stage: test
-      node_js: 12
+    - node_js: 10
       script:
         - yarn test
         - yarn build
+    - node_js: 12
+      script:
+        - yarn lint:commit-travis
+        - yarn lint
+        - yarn test
+        - yarn build
       after_success: yarn coveralls
     - stage: release
       if: branch = master AND type = push
diff --git a/package.json b/package.json
index dcd1865..fd4c0ca 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "url": "https://sharvit.github.io"
   },
   "engines": {
-    "node": ">=10"
+    "node": ">=8"
   },
   "scripts": {
     "build": "yarn build:clean && yarn build:babel && yarn build:templates",
@@ -34,7 +34,6 @@
     "@octokit/rest": "^16.28.6",
     "chalk": "^2.3.0",
     "command-exists": "^1.2.4",
-    "commitizen": "^4.0.3",
     "find-up": "^4.0.0",
     "lodash.camelcase": "^4.3.0",
     "lodash.kebabcase": "^4.1.1",
@@ -43,6 +42,10 @@
     "uuid": "^3.3.2",
     "yeoman-generator": "^4.0.1"
   },
+  "optionalDependencies": {
+    "commitizen": "^4.0.3",
+    "cz-conventional-changelog": "3.0.2"
+  },
   "devDependencies": {
     "@babel/cli": "^7.2.0",
     "@babel/core": "^7.2.0",
@@ -56,7 +59,6 @@
     "babel-plugin-add-module-exports": "^1.0.2",
     "commitlint-config-cz": "^0.12.0",
     "coveralls": "^3.0.2",
-    "cz-conventional-changelog": "3.0.2",
     "eslint": "^6.1.0",
     "eslint-config-prettier": "^6.0.0",
     "eslint-config-standard": "^13.0.1",