diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5bae116..2241494 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  shared: getoutreach/shared@1.60.0
+  shared: getoutreach/shared@1.64.3
 
 # DEPRECATED: Use the devbase orb instead:
 # https://github.com/getoutreach/devbase/tree/main/orbs/shared
@@ -64,6 +64,25 @@ jobs:
           name: Finish Coveralls upload
           command: ./scripts/shell-wrapper.sh ci/testing/coveralls-finish.sh
 
+  e2e:
+    executor:
+      name: shared/testbed-machine
+    environment:
+      VAULT_ADDR: https://vault-dev.outreach.cloud
+    resource_class: large
+    steps:
+      - shared/setup_environment:
+          machine: true
+      - shared/with_go_cache
+      - run:
+          name: Run E2E Tests
+          command: KUBECONFIG="$HOME/.outreach/kubeconfig.yaml" make e2e | tee ${TEST_RESULTS}/go-test.out
+      - run:
+          name: Upload Code Coverage
+          command: ./scripts/shell-wrapper.sh ci/testing/coveralls.sh e2e
+      - shared/save_go_cache # We save at the end because binaries are included with this
+      - shared/upload_test_results # Uploads to CircleCI
+
   release-dryrun:
     executor:
       name: shared/testbed-docker
@@ -153,9 +172,16 @@ workflows:
               ignore: /.*/
             tags:
               only: /v[0-9]+(\.[0-9]+)*(-.*)*/
+      - e2e:
+          context:
+            - docker-registry
+            - ghaccesstoken
+            - vault-dev
+            - aws-credentials
       - finalize-coverage:
           context:
             - docker-registry
             - ghaccesstoken
           requires:
+            - e2e
             - test
diff --git a/bootstrap.lock b/bootstrap.lock
index ee437ac..17bbec9 100644
--- a/bootstrap.lock
+++ b/bootstrap.lock
@@ -1,6 +1,6 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # vim: set syntax=yaml:
-version: v9.37.0-rc.28
-generated: 2022-05-04T19:28:26Z
+version: v9.37.0
+generated: 2022-05-17T22:27:33Z
 versions:
-  devbase: v1.60.0
+  devbase: v1.64.3
diff --git a/opslevel.yml b/opslevel.yml
index b6d59ce..bcf4c85 100644
--- a/opslevel.yml
+++ b/opslevel.yml
@@ -12,9 +12,9 @@ service:
   owner: fnd_dtss
   language: Golang
   framework: stencil
-  description: A GraphQL client package written in Go.
+  description: >
+    A GraphQL client package written in Go.
   ###Block(extraServiceMetadata)
-
   ###EndBlock(extraServiceMetadata)
   aliases:
     ###Block(extraAliases)
@@ -34,7 +34,7 @@ service:
     - key: name
       value: "goql"
     - key: stencil_version
-      value: "v1.14.1"
+      value: "v1.15.0"
     - key: golang_version
       value: "1.17.9"
     - key: tutorial
diff --git a/service.yaml b/service.yaml
index 15ebd30..6890c1e 100644
--- a/service.yaml
+++ b/service.yaml
@@ -39,11 +39,8 @@ arguments:
     - deploy/flagship-shared-secret/%(environment)s/authn-flagship-payload
 modules:
   - name: github.com/getoutreach/stencil-base
-    version: v0.3.0-rc.2
   - name: github.com/getoutreach/stencil-golang
-    version: v0.3.0-rc.4
   - name: github.com/getoutreach/stencil-opslevel
-    version: v0.0.2-rc.5
 opsLevel:
   serviceTier: 0
   lifecycle: ""
diff --git a/stencil.lock b/stencil.lock
index 518fc14..ec14a34 100644
--- a/stencil.lock
+++ b/stencil.lock
@@ -1,19 +1,25 @@
-version: v1.14.1
-generated: 2022-05-04T19:28:32.95381Z
+version: v1.15.0
+generated: 2022-05-17T22:27:38.379198Z
 modules:
-- name: github.com/getoutreach/stencil-base
-  url: https://github.com/getoutreach/stencil-base
-  version: v0.3.0-rc.2
-- name: github.com/getoutreach/stencil-golang
-  url: https://github.com/getoutreach/stencil-golang
-  version: v0.3.0-rc.4
 - name: github.com/getoutreach/stencil-opslevel
   url: https://github.com/getoutreach/stencil-opslevel
-  version: v0.0.2-rc.5
+  version: v0.0.2
 - name: github.com/getoutreach/stencil-discovery
   url: https://github.com/getoutreach/stencil-discovery
   version: v1.0.0
+- name: github.com/getoutreach/stencil-base
+  url: https://github.com/getoutreach/stencil-base
+  version: v0.3.0
+- name: github.com/getoutreach/stencil-golang
+  url: https://github.com/getoutreach/stencil-golang
+  version: v0.3.2
 files:
+- name: _helpers
+  template: _helpers.tpl
+  module: github.com/getoutreach/stencil-opslevel
+- name: opslevel.yml
+  template: opslevel.yml.tpl
+  module: github.com/getoutreach/stencil-opslevel
 - name: .editorconfig
   template: .editorconfig.tpl
   module: github.com/getoutreach/stencil-base
@@ -272,9 +278,3 @@ files:
 - name: scripts/golangci.yml
   template: scripts/golangci.yml.tpl
   module: github.com/getoutreach/stencil-golang
-- name: _helpers
-  template: _helpers.tpl
-  module: github.com/getoutreach/stencil-opslevel
-- name: opslevel.yml
-  template: opslevel.yml.tpl
-  module: github.com/getoutreach/stencil-opslevel