diff --git a/e2e/package-lock.json b/e2e/package-lock.json
index 0aecdbf4..430df333 100644
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -13,6 +13,15 @@
         "cypress": "^13.9.0"
       }
     },
+    "node_modules/@4tw/cypress-drag-drop": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/@4tw/cypress-drag-drop/-/cypress-drag-drop-2.2.5.tgz",
+      "integrity": "sha512-3ghTmzhOmUqeN6U3QmUnKRUxI7OMLbJA4hHUY/eS/FhWJgxbiGgcaELbolWnBAOpajPXcsNQGYEj9brd59WH6A==",
+      "dev": true,
+      "peerDependencies": {
+        "cypress": "2 - 13"
+      }
+    },
     "node_modules/@ampproject/remapping": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
@@ -1817,13 +1826,18 @@
       }
     },
     "node_modules/@cypress-brightspot/cypress-brightspot": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@cypress-brightspot/cypress-brightspot/-/cypress-brightspot-2.0.5.tgz",
-      "integrity": "sha512-mhfI7Ny6akGJU6kKee6buu8/RIvvrVDAe6D+AXgpZHoLfA6RcWXokAPf8TzkWtSeb0Gx3YDbUxYSBUxSzXfL3A==",
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@cypress-brightspot/cypress-brightspot/-/cypress-brightspot-2.1.5.tgz",
+      "integrity": "sha512-MguL3R1EmJeoVlEP2vG2TnxC2sc6Euqz9gqWhqOFf/BHKok9tL7wrQHzGU5JfH0T9XHl7VzaZZ6iRaggnLorhw==",
       "dev": true,
       "dependencies": {
+        "@4tw/cypress-drag-drop": "2.2.5",
         "@cypress/webpack-preprocessor": "^5.17.0",
+        "cypress-real-events": "^1.12.0",
         "webpack": "^5.88.2"
+      },
+      "peerDependencies": {
+        "cypress": ">=9"
       }
     },
     "node_modules/@cypress/request": {
@@ -2865,6 +2879,15 @@
         "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
       }
     },
+    "node_modules/cypress-real-events": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/cypress-real-events/-/cypress-real-events-1.13.0.tgz",
+      "integrity": "sha512-LoejtK+dyZ1jaT8wGT5oASTPfsNV8/ClRp99ruN60oPj8cBJYod80iJDyNwfPAu4GCxTXOhhAv9FO65Hpwt6Hg==",
+      "dev": true,
+      "peerDependencies": {
+        "cypress": "^4.x || ^5.x || ^6.x || ^7.x || ^8.x || ^9.x || ^10.x || ^11.x || ^12.x || ^13.x"
+      }
+    },
     "node_modules/cypress/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
diff --git a/settings.gradle b/settings.gradle
index 427c0f9f..0c020b03 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,22 +13,39 @@ pluginManagement {
 }
 
 plugins {
-    id "com.gradle.enterprise" version "3.15.1"
-    id 'com.brightspot.gradle' version '1.1.1'
+    id 'com.gradle.enterprise' version '3.15.1'
+    id 'com.brightspot.gradle' version '3.1.0-rc3'
 }
 
 rootProject.name = 'brightspot-training'
 
+dependencyResolutionManagement {
+    versionCatalogs {
+        brightspotLibs {
+            library('brightspot', 'com.psddev:brightspot-bom:4.7.11.1')
+            library('brightspotDependencies', 'com.psddev:brightspot-dependencies:4.7.11.1')
+
+            library('brightspotSharedTests' , 'com.brightspot.shared-tests:bom:0.7.1')
+
+            library('brightspotGo', 'com.brightspot.go:bom:1.5.3')
+            library('brightspotGoDependencies', 'com.brightspot.go:go-dependencies:1.5.3')
+
+            library('componentLib', 'com.psddev.component-lib:bom:4.5.24')
+            library('componentLibDependencies', 'com.psddev.component-lib:cl-dependencies:4.5.24')
+        }
+    }
+}
+
 brightspot {
     projectGroup = 'com.brightspot-training'
 
-    versions {
-        brightspot = '4.7.11.1'
-        brightspotGo = '1.5.3'
-        sharedTests = '0.7.1'
-        componentLib = '4.5.24'
-        java = 11
-    }
+    // versions {
+    //     brightspot = '4.7.11.1'
+    //     brightspotGo = '1.5.3'
+    //     sharedTests = '0.7.1'
+    //     componentLib = '4.5.24'
+    //     java = 11
+    // }
 
     dependencyConstraints = [
         // dependency conflicts across Gradle configurations
diff --git a/web/build.gradle b/web/build.gradle
index 553fad2a..6bbfb880 100644
--- a/web/build.gradle
+++ b/web/build.gradle
@@ -17,4 +17,11 @@ dependencies {
     sharedTest 'com.brightspot.shared-tests:pack-standard-backend-integration-tests'
 
     testImplementation('com.brightspot.go:lib-util-auto-dependency-test')
+
+    /**
+    Export Object Type Data (e2e)
+    Run via: ./gradlew web:exportObjectTypes
+    Object type data will be in /web/build/objectTypes.json
+    */
+    objectTypeExport 'com.brightspot.gradle:object-type-export:3.1.0-rc3'
 }