diff --git a/circle.yml b/circle.yml
index 646fc4a..fbfebc5 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,11 +1,9 @@
-machine:
-  node:
-    version: 8.11.1
-
-dependencies:
-  override:
-    - npm install
-
-test:
-  override:
-    - npm test
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/node:8.11.3
+    steps:
+      - checkout
+      - run: npm install
+      - run: npm test
diff --git a/generators/app/templates/circle.yml.template b/generators/app/templates/circle.yml.template
index 646fc4a..fbfebc5 100644
--- a/generators/app/templates/circle.yml.template
+++ b/generators/app/templates/circle.yml.template
@@ -1,11 +1,9 @@
-machine:
-  node:
-    version: 8.11.1
-
-dependencies:
-  override:
-    - npm install
-
-test:
-  override:
-    - npm test
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/node:8.11.3
+    steps:
+      - checkout
+      - run: npm install
+      - run: npm test