diff --git a/Jenkinsfile b/Jenkinsfile
index a20104b4..b0fbdeca 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,19 +21,35 @@ timestamps {
 
     stage("test") {
       exec('yarn test')
-
-      bedrockBrowsers(
-        prepareTests: {
-          yarnInstall()
-          exec('yarn build')
-        },
-        testDirs: [ 'modules/sample/src/test/ts/**/pass' ],
-        custom: '--config modules/sample/tsconfig.json --customRoutes modules/sample/routes.json --polyfills Promise Symbol'
-      )
     }
+  }
+
+  // Testing
+  stage("bedrock testing") {
+    bedrockRemoteBrowsers(
+      platforms: [
+        [ browser: 'chrome', provider: 'aws', buckets: 2 ],
+        [ browser: 'firefox', provider: 'aws', buckets: 2 ],
+        [ browser: 'edge', provider: 'lambdatest', buckets: 1 ],
+        [ browser: 'chrome', provider: 'lambdatest', os: 'macOS Sonoma', buckets: 1 ],
+        [ browser: 'firefox', provider: 'lambdatest', os: 'macOS Sonoma', buckets: 1 ],
+        [ browser: 'safari', provider: 'lambdatest', os: 'macOS Sonoma', buckets: 1 ],
+      ],
+      prepareTests: {
+        yarnInstall()
+        sh 'yarn build'
+      },
+      testDirs: [ 'modules/sample/src/test/ts/**/pass' ],
+      custom: '--config modules/sample/tsconfig.json --customRoutes modules/sample/routes.json --polyfills Promise Symbol'
+    )
+  }
 
-    if (isReleaseBranch()) {
-      stage("publish") {
+  // Publish
+  if (isReleaseBranch()) {
+    stage("publish") {
+      tinyPods.node() {
+        yarnInstall()
+        sh 'yarn build'
         tinyNpm.withNpmPublishCredentials {
           // We need to tell git to ignore the changes to .npmrc when publishing
           exec('git update-index --assume-unchanged .npmrc')