diff --git a/.circleci/config.yml b/.circleci/config.yml
index bfbcb02..a333639 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -94,6 +94,17 @@ jobs:
           paths:
             - css
 
+  commitlint:
+    <<: *defaults
+
+    steps:
+      - attach_workspace:
+          at: .
+
+      - run:
+          name: Lint commit messages
+          command: npx semantic-commitlint -- --ci
+
   lint:
     <<: *defaults
 
@@ -105,10 +116,6 @@ jobs:
           name: Lint styles
           command: npx stylelint -- --fix
 
-      - run:
-          name: Lint commit messages
-          command: npx semantic-commitlint -- --ci
-
   # test:
   #   <<: *defaults
 
@@ -172,22 +179,21 @@ workflows:
       # - coverage:
       #     requires:
       #       - install-dependencies
+      - commitlint:
+          requires:
+            - install-dependencies
       - lint:
           requires:
             - install-dependencies
       - build:
           requires:
             - install-dependencies
-          filters:
-            branches:
-              only:
-                - master
-                - develop
       - release:
           requires:
-            # - test
+            - commitlint
             - build
             - lint
+            # - test
           filters:
             branches:
               only: master