diff --git a/.circleci/config.yml b/.circleci/config.yml
index f6d22db1..c04bb654 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@
 version: 2.1
 orbs:
   shared: getoutreach/shared@dev:first
-  queue: eddiewebb/queue@1.8.4
+  queue: eddiewebb/queue@2.2.1
 
 parameters:
   rebuild_cache:
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index afb5dd91..ccb63a07 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,16 +1,17 @@
 <!--
   !!!! README !!!! Please fill this out.
 
-  Please follow the PR naming conventions: 
-  https://outreach-io.atlassian.net/wiki/spaces/EN/pages/1902444645/Conventional+Commits
+  Please follow conventional commit naming conventions:
+
+  https://www.conventionalcommits.org/en/v1.0.0/#summary
 -->
 
+Please read [CONTRIBUTING.md](CONTRIBUTING.md) for additional information on contributing to this repository!
 
 <!-- A short description of what your PR does and what it solves. -->
 ## What this PR does / why we need it
 
 
-
 <!-- <<Stencil::Block(jiraPrefix)>> -->
 
 ## Jira ID
@@ -22,8 +23,6 @@
 <!-- Notes that may be helpful for anyone reviewing this PR -->
 ## Notes for your reviewers
 
-
-
 <!-- <<Stencil::Block(custom)>> -->
 
 <!-- <</Stencil::Block>> -->
diff --git a/.gitignore b/.gitignore
index bdb56240..deda9eca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,9 @@ Pulumi.*.yaml
 # Documentation output
 /apidocs
 
+# Terraform lock files
+.terraform.lock.hcl
+
 ### Start ignores inserted by other modules
 ### End ignores inserted by other modules
 
diff --git a/.tool-versions b/.tool-versions
index 518cec45..308e355d 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -4,13 +4,13 @@
 # you are reducing compatibility guarantees.
 ## <<Stencil::Block(toolverOverride)>>
 ## <</Stencil::Block>>
+nodejs 18.17.1
 protoc 21.5
-nodejs 18.14.1
-golang 1.20.7
-terraform 1.4.4
+golang 1.20.8
 # Note: Versions in this block do not override the default versions above
 # but sometimes you have to declare additional versions of the same tool
 # while leaving the 'default' version intact for the infra.
 # The most common case is nodejs.
 ## <<Stencil::Block(toolver)>>
+terraform 1.6.2
 ## <</Stencil::Block>>
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 324648ca..5dcb436d 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -36,16 +36,16 @@
           "to": "/home/dev/app"
         },
         // Maps the go module cache on the host to the persistent volume used by devspaces.
-        // See the value of `go env GOMODCACHE` on the host and devspace.
+        // These should be the respective values of `go env GOMODCACHE`.
         {
-          "from": "${env:HOME}/.asdf/installs/golang/1.20.7/packages/pkg/mod",
-          "to": "/tmp/cache/go/mod/"
+          "from": "${env:HOME}/.asdf/installs/golang/1.20.8/packages/pkg/mod",
+          "to": "/home/dev/.asdf/installs/golang/1.20.8/packages/pkg/mod"
         },
         {
           // Maps the standard library location on the host to the location in the devspace.
           // This enables debugging standard library code.
-          "from": "${env:HOME}/.asdf/installs/golang/1.20.7/go/src",
-          "to": "/home/dev/.asdf/installs/golang/1.20.7/go/src"
+          "from": "${env:HOME}/.asdf/installs/golang/1.20.8/go/src",
+          "to": "/home/dev/.asdf/installs/golang/1.20.8/go/src"
         }
       ]
     },
diff --git a/monitoring/slos.tf b/monitoring/slos.tf
deleted file mode 100644
index 54d02278..00000000
--- a/monitoring/slos.tf
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-// <<Stencil::Block(tfCustomSLODatadog)>>
-
-// <</Stencil::Block>>
diff --git a/stencil.lock b/stencil.lock
index bc1328a5..82304384 100644
--- a/stencil.lock
+++ b/stencil.lock
@@ -1,4 +1,4 @@
-version: v1.36.0
+version: v1.37.0
 modules:
     - name: github.com/getoutreach/devbase
       url: https://github.com/getoutreach/devbase
@@ -8,10 +8,10 @@ modules:
       version: v0.3.0
     - name: github.com/getoutreach/stencil-base
       url: https://github.com/getoutreach/stencil-base
-      version: v0.12.0
+      version: v0.14.0
     - name: github.com/getoutreach/stencil-circleci
       url: https://github.com/getoutreach/stencil-circleci
-      version: v1.10.0
+      version: v1.11.1
     - name: github.com/getoutreach/stencil-golang
       url: https://github.com/getoutreach/stencil-golang
       version: unstable
@@ -67,18 +67,12 @@ files:
     - name: .vscode/settings.json
       template: .vscode/settings.json.tpl
       module: github.com/getoutreach/stencil-golang
-    - name: CONTRIBUTING.md
-      template: CONTRIBUTING.md.tpl
-      module: github.com/getoutreach/stencil-base
     - name: LICENSE
       template: LICENSE.tpl
       module: github.com/getoutreach/stencil-base
     - name: Makefile
       template: Makefile.tpl
       module: github.com/getoutreach/stencil-golang
-    - name: README.md
-      template: README.md.tpl
-      module: github.com/getoutreach/stencil-base
     - name: cmd/stencil/stencil.go
       template: cmd/main_cli.go.tpl
       module: github.com/getoutreach/stencil-golang