diff --git a/.circleci/config.yml b/.circleci/config.yml
index 94cbfd7b46..54e711bdd0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,13 +8,14 @@ jobs:
   test-sql-13-alpine:
     machine:
       image: ubuntu-2004:202107-02
+    resource_class: medium
+    working_directory: ~/boundary
     steps:
     - checkout
     - run:
         command: |
           make test-sql POSTGRES_DOCKER_IMAGE_BASE=docker.mirror.hashicorp.services/postgres PG_DOCKER_TAG=13-alpine
         name: Run SQL PgTap Tests
-    working_directory: ~/boundary
   bundle-releases:
     docker:
     - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
@@ -250,13 +251,14 @@ jobs:
   test-sql-11-alpine:
     machine:
       image: ubuntu-2004:202107-02
+    resource_class: medium
+    working_directory: ~/boundary
     steps:
     - checkout
     - run:
         command: |
           make test-sql POSTGRES_DOCKER_IMAGE_BASE=docker.mirror.hashicorp.services/postgres PG_DOCKER_TAG=11-alpine
         name: Run SQL PgTap Tests
-    working_directory: ~/boundary
   build-common-layers:
     machine:
       image: ubuntu-1604:202007-01
@@ -888,13 +890,14 @@ jobs:
   test-sql-12-alpine:
     machine:
       image: ubuntu-2004:202107-02
+    resource_class: medium
+    working_directory: ~/boundary
     steps:
     - checkout
     - run:
         command: |
           make test-sql POSTGRES_DOCKER_IMAGE_BASE=docker.mirror.hashicorp.services/postgres PG_DOCKER_TAG=12-alpine
         name: Run SQL PgTap Tests
-    working_directory: ~/boundary
   solaris_amd64_package:
     docker:
     - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
@@ -971,6 +974,7 @@ jobs:
     machine:
       image: ubuntu-2004:202107-02
     resource_class: large
+    working_directory: ~/boundary
     steps:
     - checkout
     - run:
@@ -1116,7 +1120,6 @@ jobs:
         name: Slack - Sending Status Alert
         shell: /bin/bash
         when: always
-    working_directory: ~/boundary
   netbsd_amd64_package:
     docker:
     - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
@@ -1480,13 +1483,14 @@ jobs:
   test-sql-latest:
     machine:
       image: ubuntu-2004:202107-02
+    resource_class: medium
+    working_directory: ~/boundary
     steps:
     - checkout
     - run:
         command: |
           make test-sql POSTGRES_DOCKER_IMAGE_BASE=docker.mirror.hashicorp.services/postgres PG_DOCKER_TAG=latest
         name: Run SQL PgTap Tests
-    working_directory: ~/boundary
 workflows:
   build-645fb387fb0a87de:
     jobs:
@@ -1553,7 +1557,7 @@ workflows:
     - windows_amd64_package:
         requires:
         - build-common-layers
-  default:
+  ci:
     jobs:
     - build
     - test-sql-latest
diff --git a/.circleci/config/executors/@executors.yml b/.circleci/config/executors/@executors.yml
new file mode 100644
index 0000000000..7e95bd3c57
--- /dev/null
+++ b/.circleci/config/executors/@executors.yml
@@ -0,0 +1,10 @@
+go-machine:
+  machine:
+    image: 'ubuntu-2004:202107-02'
+  resource_class: large
+  working_directory: ~/boundary
+go-machine-medium:
+  machine:
+    image: 'ubuntu-2004:202107-02'
+  resource_class: medium
+  working_directory: ~/boundary
diff --git a/.circleci/config/jobs/build.yml b/.circleci/config/jobs/build.yml
index 87a76947a6..9efbe0e0c9 100644
--- a/.circleci/config/jobs/build.yml
+++ b/.circleci/config/jobs/build.yml
@@ -1,7 +1,4 @@
-resource_class: large
-machine:
-  image: 'ubuntu-2004:202107-02'
-working_directory: ~/boundary
+executor: go-machine
 steps:
 - checkout
 - run:
diff --git a/.circleci/config/jobs/test-sql.yml b/.circleci/config/jobs/test-sql.yml
index f82933aa11..671be2394f 100644
--- a/.circleci/config/jobs/test-sql.yml
+++ b/.circleci/config/jobs/test-sql.yml
@@ -1,6 +1,4 @@
-machine:
-  image: 'ubuntu-2004:202107-02'
-working_directory: ~/boundary
+executor: go-machine-medium
 parameters:
   postgres-version:
     type: string
diff --git a/.circleci/config/workflows/default.yml b/.circleci/config/workflows/ci.yml
similarity index 100%
rename from .circleci/config/workflows/default.yml
rename to .circleci/config/workflows/ci.yml