diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5f99e630f..68b877d0d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -333,6 +333,7 @@ jobs:
         command: server /data --console-address ":9001"
         # environment:
 
+    resource_class: medium+
     environment:
       NODE_ENV: test
       DATABASE_URL: 'postgres://speckle:speckle@127.0.0.1:5432/speckle2_test'
diff --git a/packages/server/modules/shared/helpers/envHelper.ts b/packages/server/modules/shared/helpers/envHelper.ts
index 3fc154e28..91afa4199 100644
--- a/packages/server/modules/shared/helpers/envHelper.ts
+++ b/packages/server/modules/shared/helpers/envHelper.ts
@@ -187,3 +187,7 @@ export function speckleAutomateUrl() {
 export function ignoreMissingMigrations() {
   return ['1', 'true'].includes(process.env.IGNORE_MISSING_MIRATIONS || 'false')
 }
+
+export function enableServerGuests() {
+  return ['1', 'true'].includes(process.env.ENABLE_SERVER_GUESTS || 'false')
+}
diff --git a/utils/helm/speckle-server/templates/server/deployment.yml b/utils/helm/speckle-server/templates/server/deployment.yml
index 9d7bd9621..8f70b96c6 100644
--- a/utils/helm/speckle-server/templates/server/deployment.yml
+++ b/utils/helm/speckle-server/templates/server/deployment.yml
@@ -209,6 +209,11 @@ spec:
                 key: {{ default "google_client_secret" .Values.server.auth.google.clientSecret.secretKey }}
           {{- end }}
 
+          {{- if .Values.serverGuestsEnabled }}
+          - name: ENABLE_SERVER_GUESTS 
+            value: true
+          {{- end }}
+
           # Github Auth
           {{- if .Values.server.auth.github.enabled }}
           - name: STRATEGY_GITHUB
diff --git a/utils/helm/speckle-server/values.schema.json b/utils/helm/speckle-server/values.schema.json
index 850a6e2ba..b9491a413 100644
--- a/utils/helm/speckle-server/values.schema.json
+++ b/utils/helm/speckle-server/values.schema.json
@@ -97,6 +97,11 @@
       "description": "This maximum size of any single file (unit is Megabytes) that can be uploaded to Speckle",
       "default": 100
     },
+    "serverGuestsEnabled": {
+      "type": "boolean",
+      "description": "Enables users to join the server as Guests, having limiter permissions",
+      "default": false
+    },
     "enable_prometheus_monitoring": {
       "type": "boolean",
       "description": "If enabled, Speckle deploys a Prometheus ServiceMonitor resource",
diff --git a/utils/helm/speckle-server/values.yaml b/utils/helm/speckle-server/values.yaml
index d9fabb523..079a3e70f 100644
--- a/utils/helm/speckle-server/values.yaml
+++ b/utils/helm/speckle-server/values.yaml
@@ -84,6 +84,9 @@ secretName: server-vars
 ##
 file_size_limit_mb: 100
 
+## @param serverGuestsEnabled Enables users to join the server as Guests, having limiter permissions
+serverGuestsEnabled: false
+
 ## @section Monitoring
 ## @descriptionStart
 ## This enables metrics generated by Speckle to be ingested by Prometheus: https://prometheus.io/