diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9fa5b93..ac75f53 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,13 +15,10 @@ jobs:
           name: Compile
           command: make build
       - persist_to_workspace:
-          root: .make
+          root: $CIRCLE_WORKING_DIRECTORY
           paths:
-            - '*'
-      - persist_to_workspace:
-          root: dist
-          paths:
-            - '*'
+            - .make
+            - dist
       - save_cache:
           key: v1-stack-{{ checksum "package.yaml" }}-{{ checksum "stack.yaml" }}
           name: Caching stack
@@ -50,9 +47,7 @@ jobs:
     steps:
       - checkout
       - attach_workspace:
-          at: .make
-      - attach_workspace:
-          at: dist
+          at: $CIRCLE_WORKING_DIRECTORY
       - run:
           name: Test
           command: make test