diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3236610b..ed154684 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,19 +1,24 @@
-version: 2.0
+version: 2.1
+
+executors:
+  build-test: # declares a reusable executor
+    machine: true
+    working_directory: ~/workspace
 
 jobs:
     checkout:
-        machine: true
+        executor: build-test
         steps:
             - checkout
     release:
-        machine: true
+        executor: build-test
         steps:
             - restore_cache:
                 keys:
                     - gradle-{{ checksum "build.gradle" }}-{{ checksum "settings.gradle" }}
             - run: ./gradlew release -Prelease.disableChecks -Prelease.localOnly
     build:
-        machine: true
+        executor: build-test
         steps:
             - run:
                 name: Build and Test
@@ -25,7 +30,7 @@ jobs:
                 path: build/libs
                 destination: libs
     test:
-        machine: true
+        executor: build-test
         steps:
             - run:
                 name: Build and Test
@@ -38,7 +43,7 @@ jobs:
             - store_test_results:
                 path: build/test-results
     publish:
-        machine: true
+        executor: build-test
         steps:
             - run: ./gradlew publishPlugins githubRelease