diff --git a/.circleci/config.yml b/.circleci/config.yml
index 79f42c60..e497882f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,11 +1,27 @@
 version: 2.1
-#####
-# Circle CI
-#
-# For running docker images on circle ci, see: https://circleci.com/docs/docker
-# For circle.yml explanation, see: https://circleci.com/docs/manually
-#####
 
-machine:
-  node:
-    version: 6.4.0
+executors:
+  docker-circleci:
+    working_directory: "~/repo"
+    docker:
+      - image: "circleci/node:10.12-stretch-browsers"
+
+jobs:
+  unit_test:
+    executor: docker-circleci
+    steps:
+      - checkout
+      - run: npm ci
+      - run: npm test
+  prepare_release:
+    executor: docker-circleci
+    steps:
+      - checkout
+      - run: npm ci
+      - run: npm build
+
+workflows:
+  build_test:
+    jobs:
+      - unit_test
+      - prepare_release