diff --git a/.devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC-Unittests.xml b/.devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC-Unittests.xml
similarity index 94%
rename from .devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC-Unittests.xml
rename to .devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC-Unittests.xml
index 940255d2369..a324d92d8d8 100644
--- a/.devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC-Unittests.xml
+++ b/.devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC-Unittests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[Mariadb] Unittests" type="RakeRunConfigurationType" factoryName="Rake">
+  <configuration default="false" name="[Mysql] Unittests" type="RakeRunConfigurationType" factoryName="Rake">
     <module name="cloud_controller_ng" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$PROJECT_DIR$" />
@@ -22,7 +22,7 @@
       <option name="DIRENV_TRUSTED" value="false" />
     </EXTENSION>
     <EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
-    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="spec:all" />
+    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="spec" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":rspec " />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
diff --git a/.devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC.xml b/.devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC.xml
similarity index 83%
rename from .devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC.xml
rename to .devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC.xml
index 3fdfc957f90..0bc503cfbba 100644
--- a/.devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC.xml
+++ b/.devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[Mariadb] CloudController" type="RubyRunConfigurationType" factoryName="Ruby">
+  <configuration default="false" name="[Mysql] CloudController" type="RubyRunConfigurationType" factoryName="Ruby">
     <module name="cloud_controller_ng" />
     <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="" />
     <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$PROJECT_DIR$" />
@@ -10,6 +10,7 @@
       <env name="DB" value="mysql" />
       <env name="DB_CONNECTION_STRING" value="mysql2://root:supersecret@127.0.0.1:3306/ccdb" />
       <env name="DISABLE_SPRING" value="true" />
+      <env name="STORAGE_CLI_PATH" value="$PROJECT_DIR$/tmp/bin/storage-cli" />
     </envs>
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
     <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
@@ -24,7 +25,7 @@
     </EXTENSION>
     <EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
     <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$PROJECT_DIR$/bin/cloud_controller" />
-    <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="-c tmp/cloud_controller.yml" />
+    <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="-c tmp/.dev-generated/cloud_controller.local.yml" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC_Local_Worker.xml b/.devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC_Local_Worker.xml
similarity index 87%
rename from .devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC_Local_Worker.xml
rename to .devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC_Local_Worker.xml
index 236d53459e0..727bf1c72b8 100644
--- a/.devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC_Local_Worker.xml
+++ b/.devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC_Local_Worker.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[Mariadb] CC Local Worker" type="RakeRunConfigurationType" factoryName="Rake">
+  <configuration default="false" name="[Mysql] CC Local Worker" type="RakeRunConfigurationType" factoryName="Rake">
     <module name="cloud_controller_ng" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$PROJECT_DIR$" />
@@ -9,8 +9,9 @@
     <envs>
       <env name="DB" value="mysql" />
       <env name="DB_CONNECTION_STRING" value="mysql2://root:supersecret@127.0.0.1:3306/ccdb" />
-      <env name="CLOUD_CONTROLLER_NG_CONFIG" value="tmp/cloud_controller.yml" />
+      <env name="CLOUD_CONTROLLER_NG_CONFIG" value="tmp/.dev-generated/cloud_controller.local.yml" />
       <env name="DISABLE_SPRING" value="true" />
+      <env name="STORAGE_CLI_PATH" value="$PROJECT_DIR$/tmp/bin/storage-cli" />
     </envs>
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
     <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov" ENABLE_BRANCH_COVERAGE="true" ENABLE_FORKED_COVERAGE="true">
diff --git a/.devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC_Scheduler.xml b/.devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC_Scheduler.xml
similarity index 87%
rename from .devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC_Scheduler.xml
rename to .devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC_Scheduler.xml
index fa40c58f5ac..ab396a2dd2e 100644
--- a/.devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC_Scheduler.xml
+++ b/.devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC_Scheduler.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[Mariadb] CC Scheduler" type="RakeRunConfigurationType" factoryName="Rake">
+  <configuration default="false" name="[Mysql] CC Scheduler" type="RakeRunConfigurationType" factoryName="Rake">
     <module name="cloud_controller_ng" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$PROJECT_DIR$" />
@@ -9,8 +9,9 @@
     <envs>
       <env name="DB" value="mysql" />
       <env name="DB_CONNECTION_STRING" value="mysql2://root:supersecret@127.0.0.1:3306/ccdb" />
-      <env name="CLOUD_CONTROLLER_NG_CONFIG" value="tmp/cloud_controller.yml" />
+      <env name="CLOUD_CONTROLLER_NG_CONFIG" value="tmp/.dev-generated/cloud_controller.local.yml" />
       <env name="DISABLE_SPRING" value="true" />
+      <env name="STORAGE_CLI_PATH" value="$PROJECT_DIR$/tmp/bin/storage-cli" />
     </envs>
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
     <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov" ENABLE_BRANCH_COVERAGE="true" ENABLE_FORKED_COVERAGE="true">
diff --git a/.devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC_Worker.xml b/.devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC_Worker.xml
similarity index 87%
rename from .devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC_Worker.xml
rename to .devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC_Worker.xml
index 3866b6b66ee..ae4f5621871 100644
--- a/.devcontainer/configs/intellij/.idea/runConfigurations/_Mariadb__CC_Worker.xml
+++ b/.devcontainer/configs/intellij/.idea/runConfigurations/_Mysql__CC_Worker.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[Mariadb] CC Worker" type="RakeRunConfigurationType" factoryName="Rake">
+  <configuration default="false" name="[Mysql] CC Worker" type="RakeRunConfigurationType" factoryName="Rake">
     <module name="cloud_controller_ng" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$PROJECT_DIR$" />
@@ -9,8 +9,9 @@
     <envs>
       <env name="DB" value="mysql" />
       <env name="DB_CONNECTION_STRING" value="mysql2://root:supersecret@127.0.0.1:3306/ccdb" />
-      <env name="CLOUD_CONTROLLER_NG_CONFIG" value="tmp/cloud_controller.yml" />
+      <env name="CLOUD_CONTROLLER_NG_CONFIG" value="tmp/.dev-generated/cloud_controller.local.yml" />
       <env name="DISABLE_SPRING" value="true" />
+      <env name="STORAGE_CLI_PATH" value="$PROJECT_DIR$/tmp/bin/storage-cli" />
     </envs>
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
     <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov" ENABLE_BRANCH_COVERAGE="true" ENABLE_FORKED_COVERAGE="true">
diff --git a/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC-Unittests.xml b/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC-Unittests.xml
index fb24803cc6a..3258e4a548d 100644
--- a/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC-Unittests.xml
+++ b/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC-Unittests.xml
@@ -22,7 +22,7 @@
       <option name="DIRENV_TRUSTED" value="false" />
     </EXTENSION>
     <EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
-    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="spec:all" />
+    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="spec" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":rspec " />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
diff --git a/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC.xml b/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC.xml
index b67c471e412..0851ed32c51 100644
--- a/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC.xml
+++ b/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC.xml
@@ -10,6 +10,7 @@
       <env name="DB" value="postgres" />
       <env name="DB_CONNECTION_STRING" value="postgres://postgres:supersecret@localhost:5432/ccdb" />
       <env name="DISABLE_SPRING" value="true" />
+      <env name="STORAGE_CLI_PATH" value="$PROJECT_DIR$/tmp/bin/storage-cli" />
     </envs>
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
     <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
@@ -24,7 +25,7 @@
     </EXTENSION>
     <EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
     <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$PROJECT_DIR$/bin/cloud_controller" />
-    <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="-c tmp/cloud_controller.yml" />
+    <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="-c tmp/.dev-generated/cloud_controller.local.yml" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC_Local_Worker.xml b/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC_Local_Worker.xml
index d608040d382..008cc149b82 100644
--- a/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC_Local_Worker.xml
+++ b/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC_Local_Worker.xml
@@ -9,8 +9,9 @@
     <envs>
       <env name="DB" value="postgres" />
       <env name="DB_CONNECTION_STRING" value="postgres://postgres:supersecret@localhost:5432/ccdb" />
-      <env name="CLOUD_CONTROLLER_NG_CONFIG" value="tmp/cloud_controller.yml" />
+      <env name="CLOUD_CONTROLLER_NG_CONFIG" value="tmp/.dev-generated/cloud_controller.local.yml" />
       <env name="DISABLE_SPRING" value="true" />
+      <env name="STORAGE_CLI_PATH" value="$PROJECT_DIR$/tmp/bin/storage-cli" />
     </envs>
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
     <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov" ENABLE_BRANCH_COVERAGE="true" ENABLE_FORKED_COVERAGE="true">
diff --git a/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC_Scheduler.xml b/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC_Scheduler.xml
index f2ec5813a7e..549a96dce52 100644
--- a/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC_Scheduler.xml
+++ b/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC_Scheduler.xml
@@ -9,8 +9,9 @@
     <envs>
       <env name="DB" value="postgres" />
       <env name="DB_CONNECTION_STRING" value="postgres://postgres:supersecret@localhost:5432/ccdb" />
-      <env name="CLOUD_CONTROLLER_NG_CONFIG" value="tmp/cloud_controller.yml" />
+      <env name="CLOUD_CONTROLLER_NG_CONFIG" value="tmp/.dev-generated/cloud_controller.local.yml" />
       <env name="DISABLE_SPRING" value="true" />
+      <env name="STORAGE_CLI_PATH" value="$PROJECT_DIR$/tmp/bin/storage-cli" />
     </envs>
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
     <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov" ENABLE_BRANCH_COVERAGE="true" ENABLE_FORKED_COVERAGE="true">
diff --git a/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC_Worker.xml b/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC_Worker.xml
index fa5aceb48ef..cdfc7866208 100644
--- a/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC_Worker.xml
+++ b/.devcontainer/configs/intellij/.idea/runConfigurations/_Postgres__CC_Worker.xml
@@ -9,8 +9,9 @@
     <envs>
       <env name="DB" value="postgres" />
       <env name="DB_CONNECTION_STRING" value="postgres://postgres:supersecret@localhost:5432/ccdb" />
-      <env name="CLOUD_CONTROLLER_NG_CONFIG" value="tmp/cloud_controller.yml" />
+      <env name="CLOUD_CONTROLLER_NG_CONFIG" value="tmp/.dev-generated/cloud_controller.local.yml" />
       <env name="DISABLE_SPRING" value="true" />
+      <env name="STORAGE_CLI_PATH" value="$PROJECT_DIR$/tmp/bin/storage-cli" />
     </envs>
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
     <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov" ENABLE_BRANCH_COVERAGE="true" ENABLE_FORKED_COVERAGE="true">
diff --git a/.devcontainer/configs/vscode/.vscode/extensions.json b/.devcontainer/configs/vscode/.vscode/extensions.json
new file mode 100644
index 00000000000..d480bcfa714
--- /dev/null
+++ b/.devcontainer/configs/vscode/.vscode/extensions.json
@@ -0,0 +1,11 @@
+{
+  "recommendations": [
+    "KoichiSasada.vscode-rdbg",
+    "Fooo.ruby-spec-runner",
+    "castwide.solargraph",
+    "eamodio.gitlens"
+  ],
+  "unwantedRecommendations": [
+    "Shopify.ruby-lsp"
+  ]
+}
diff --git a/.devcontainer/configs/vscode/.vscode/launch.json b/.devcontainer/configs/vscode/.vscode/launch.json
index 0ca4fc5e84e..b5cd8a923d0 100644
--- a/.devcontainer/configs/vscode/.vscode/launch.json
+++ b/.devcontainer/configs/vscode/.vscode/launch.json
@@ -1,7 +1,11 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    // Run/Debug configurations for Cloud Controller
+    //
+    // These configs work in both local and devcontainer environments:
+    // - Local: Uses POSTGRES_CONNECTION_PREFIX from .envrc (localhost)
+    // - Devcontainer: Uses POSTGRES_CONNECTION_PREFIX from devcontainer.json (postgres container)
+    //
+    // Run 'cc-generate-config' first to create tmp/.dev-generated/cloud_controller.*.yml
     "version": "0.2.0",
     "configurations": [
         {
@@ -11,36 +15,23 @@
             "useBundler": true,
             "cwd": "${workspaceRoot}",
             "command": "bin/cloud_controller",
-            "script": "-c tmp/cloud_controller.yml",
+            "script": "-c tmp/.dev-generated/cloud_controller.${env:CC_CONFIG}.yml",
             "env": {
                 "DB": "postgres",
-                "DB_CONNECTION_STRING": "postgres://postgres:supersecret@localhost:5432/ccdb"
+                "DB_CONNECTION_STRING": "${env:POSTGRES_CONNECTION_PREFIX}/ccdb"
             }
         },
         {
-            "name": "[Mariadb] CloudController",
+            "name": "[Mysql] CloudController",
             "type": "rdbg",
             "request": "launch",
             "useBundler": true,
             "cwd": "${workspaceRoot}",
             "command": "bin/cloud_controller",
-            "script": "-c tmp/cloud_controller.yml",
+            "script": "-c tmp/.dev-generated/cloud_controller.${env:CC_CONFIG}.yml",
             "env": {
                 "DB": "mysql",
-                "DB_CONNECTION_STRING": "mysql2://root:supersecret@localhost:3306/ccdb"
-            }
-        },
-        {
-            "name": "[Mariadb] Unittests",
-            "type": "rdbg",
-            "request": "launch",
-            "useBundler": true,
-            "cwd": "${workspaceRoot}",
-            "command": "bin/rake",
-            "script": "spec:all",
-            "env": {
-                "DB": "mysql",
-                "MYSQL_CONNECTION_PREFIX": "mysql2://root:supersecret@localhost:3306"
+                "DB_CONNECTION_STRING": "${env:MYSQL_CONNECTION_PREFIX}/ccdb"
             }
         },
         {
@@ -50,42 +41,41 @@
             "useBundler": true,
             "cwd": "${workspaceRoot}",
             "command": "bin/rake",
-            "script": "spec:all",
+            "script": "spec",
             "env": {
                 "DB": "postgres",
-                "POSTGRES_CONNECTION_PREFIX": "postgres://postgres:supersecret@localhost:5432"
+                "POSTGRES_CONNECTION_PREFIX": "${env:POSTGRES_CONNECTION_PREFIX}"
             }
         },
         {
-            "name": "[Mariadb] CC Worker",
+            "name": "[Mysql] Unittests",
             "type": "rdbg",
             "request": "launch",
             "useBundler": true,
             "cwd": "${workspaceRoot}",
             "command": "bin/rake",
-            "script": "jobs:generic",
+            "script": "spec",
             "env": {
                 "DB": "mysql",
-                "DB_CONNECTION_STRING": "mysql2://root:supersecret@localhost:3306/ccdb",
-                "CLOUD_CONTROLLER_NG_CONFIG": "tmp/cloud_controller.yml"
+                "MYSQL_CONNECTION_PREFIX": "${env:MYSQL_CONNECTION_PREFIX}"
             }
         },
         {
-            "name": "[Postgres] CC Worker",
+            "name": "[Postgres] CC Local Worker",
             "type": "rdbg",
             "request": "launch",
             "useBundler": true,
             "cwd": "${workspaceRoot}",
             "command": "bin/rake",
-            "script": "jobs:generic",
+            "script": "jobs:local",
             "env": {
                 "DB": "postgres",
-                "DB_CONNECTION_STRING": "postgres://postgres:supersecret@localhost:5432/ccdb",
-                "CLOUD_CONTROLLER_NG_CONFIG": "tmp/cloud_controller.yml"
+                "DB_CONNECTION_STRING": "${env:POSTGRES_CONNECTION_PREFIX}/ccdb",
+                "CLOUD_CONTROLLER_NG_CONFIG": "tmp/.dev-generated/cloud_controller.${env:CC_CONFIG}.yml"
             }
         },
         {
-            "name": "[Mariadb] CC Local Worker",
+            "name": "[Mysql] CC Local Worker",
             "type": "rdbg",
             "request": "launch",
             "useBundler": true,
@@ -94,36 +84,36 @@
             "script": "jobs:local",
             "env": {
                 "DB": "mysql",
-                "DB_CONNECTION_STRING": "mysql2://root:supersecret@localhost:3306/ccdb",
-                "CLOUD_CONTROLLER_NG_CONFIG": "tmp/cloud_controller.yml"
+                "DB_CONNECTION_STRING": "${env:MYSQL_CONNECTION_PREFIX}/ccdb",
+                "CLOUD_CONTROLLER_NG_CONFIG": "tmp/.dev-generated/cloud_controller.${env:CC_CONFIG}.yml"
             }
         },
         {
-            "name": "[Postgres] CC Local Worker",
+            "name": "[Postgres] CC Generic Worker",
             "type": "rdbg",
             "request": "launch",
             "useBundler": true,
             "cwd": "${workspaceRoot}",
             "command": "bin/rake",
-            "script": "jobs:local",
+            "script": "jobs:generic",
             "env": {
                 "DB": "postgres",
-                "DB_CONNECTION_STRING": "postgres://postgres:supersecret@localhost:5432/ccdb",
-                "CLOUD_CONTROLLER_NG_CONFIG": "tmp/cloud_controller.yml"
+                "DB_CONNECTION_STRING": "${env:POSTGRES_CONNECTION_PREFIX}/ccdb",
+                "CLOUD_CONTROLLER_NG_CONFIG": "tmp/.dev-generated/cloud_controller.${env:CC_CONFIG}.yml"
             }
         },
         {
-            "name": "[Mariadb] CC Scheduler",
+            "name": "[Mysql] CC Generic Worker",
             "type": "rdbg",
             "request": "launch",
             "useBundler": true,
             "cwd": "${workspaceRoot}",
             "command": "bin/rake",
-            "script": "clock:start",
+            "script": "jobs:generic",
             "env": {
                 "DB": "mysql",
-                "DB_CONNECTION_STRING": "mysql2://root:supersecret@localhost:3306/ccdb",
-                "CLOUD_CONTROLLER_NG_CONFIG": "tmp/cloud_controller.yml"
+                "DB_CONNECTION_STRING": "${env:MYSQL_CONNECTION_PREFIX}/ccdb",
+                "CLOUD_CONTROLLER_NG_CONFIG": "tmp/.dev-generated/cloud_controller.${env:CC_CONFIG}.yml"
             }
         },
         {
@@ -136,9 +126,23 @@
             "script": "clock:start",
             "env": {
                 "DB": "postgres",
-                "DB_CONNECTION_STRING": "postgres://postgres:supersecret@localhost:5432/ccdb",
-                "CLOUD_CONTROLLER_NG_CONFIG": "tmp/cloud_controller.yml"
+                "DB_CONNECTION_STRING": "${env:POSTGRES_CONNECTION_PREFIX}/ccdb",
+                "CLOUD_CONTROLLER_NG_CONFIG": "tmp/.dev-generated/cloud_controller.${env:CC_CONFIG}.yml"
+            }
+        },
+        {
+            "name": "[Mysql] CC Scheduler",
+            "type": "rdbg",
+            "request": "launch",
+            "useBundler": true,
+            "cwd": "${workspaceRoot}",
+            "command": "bin/rake",
+            "script": "clock:start",
+            "env": {
+                "DB": "mysql",
+                "DB_CONNECTION_STRING": "${env:MYSQL_CONNECTION_PREFIX}/ccdb",
+                "CLOUD_CONTROLLER_NG_CONFIG": "tmp/.dev-generated/cloud_controller.${env:CC_CONFIG}.yml"
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/.devcontainer/configs/vscode/.vscode/settings.json b/.devcontainer/configs/vscode/.vscode/settings.json
index c14a0a2ae87..7d8c7fec86e 100644
--- a/.devcontainer/configs/vscode/.vscode/settings.json
+++ b/.devcontainer/configs/vscode/.vscode/settings.json
@@ -1,16 +1,40 @@
 {
+  // ==========================================================================
+  // TEST RUNNING: Use ruby-spec-runner (status bar buttons: "Run spec" / "Debug spec")
+  // Note: VS Code test explorer disabled - Ruby LSP hangs on large codebases
+  // ==========================================================================
   "ruby-spec-runner.rspecEnv": {
     "DB": "postgres",
-    "POSTGRES_CONNECTION_PREFIX": "postgres://postgres:supersecret@localhost:5432",
-    "MYSQL_CONNECTION_PREFIX": "mysql2://root:supersecret@localhost:3306"
+    "POSTGRES_CONNECTION_PREFIX": "postgres://postgres:supersecret@postgres:5432"
   },
+  "ruby-spec-runner.rspecCommand": "bundle exec rspec",
+  "ruby-spec-runner.changeDirectoryToWorkspaceRoot": true,
+
+  // Ruby LSP - use rvm Ruby
+  "rubyLsp.rubyVersionManager": {
+    "identifier": "rvm"
+  },
+  "rubyLsp.testFramework": "rspec",
+
+  // RuboCop
   "ruby.rubocop.autocorrectOnSave": true,
   "ruby.rubocop.configFilePath": ".rubocop.yml",
   "ruby.rubocop.hideDisableSuggestions": true,
   "ruby.rubocop.useBundler": true,
   "ruby.rubocop.useServer": true,
   "ruby.rubocop.onSave": true,
-  "solargraph.useBundler": false,
+
+  // Solargraph - code intelligence
+  "solargraph.useBundler": true,
+  "solargraph.diagnostics": false,
+  "solargraph.formatting": false,
+  "solargraph.completion": true,
+  "solargraph.hover": true,
+  "solargraph.definitions": true,
+  "solargraph.references": true,
+  "solargraph.symbols": true,
+
+  // Editor
   "editor.bracketPairColorization.enabled": true,
   "editor.guides.bracketPairs": true
-}
\ No newline at end of file
+}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4fbbe631148..f59201ade1b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -15,20 +15,37 @@
         "postgres",
         "mysql",
         "uaa",
-        "minio",
         "catsbroker",
         "nginx"
     ],
+    "features": {
+        "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
+            "moby": false
+        }
+    },
     "workspaceFolder": "/workspace",
-    "initializeCommand": ".devcontainer/scripts/codespaces_init.sh",
-    "onCreateCommand": ".devcontainer/scripts/codespaces_start.sh",
+    "postCreateCommand": "direnv allow",
+    "postStartCommand": ".devcontainer/scripts/cc-setup-devcontainer && cc-setup-ide",
+    "remoteEnv": {
+        "DEVCONTAINER": "true",
+        "CC_CONFIG": "devcontainer",
+        "DB": "postgres",
+        "COMPOSE_PROJECT_NAME": "cloud_controller_ng",
+        "COMPOSE_PROFILES": "dev,broker",
+        "PATH": "${containerEnv:PATH}:/usr/local/bin:${containerWorkspaceFolder}/.devcontainer/scripts",
+        "POSTGRES_CONNECTION_PREFIX": "postgres://postgres:supersecret@postgres:5432",
+        "MYSQL_CONNECTION_PREFIX": "mysql2://root:supersecret@mysql:3306"
+    },
     "customizations": {
-        // Configure properties specific to VS Code.
         "vscode": {
-            // Set *default* container specific settings.json values on container create.
-            "settings": {},
-            // Add the IDs of extensions you want installed when the container is created.
+            "settings": {
+                "rubyLsp.rubyVersionManager": {
+                    "identifier": "rvm"
+                },
+                "rubyLsp.testFramework": "rspec"
+            },
             "extensions": [
+                "Shopify.ruby-lsp",
                 "ms-azuretools.vscode-docker",
                 "oderwat.indent-rainbow",
                 "KoichiSasada.vscode-rdbg",
@@ -39,16 +56,14 @@
             ]
         }
     },
-    // Use 'forwardPorts' to make a list of ports inside the container available locally.
     "forwardPorts": [
         80,
         1234,
+        8333,
         9292,
         9393,
-        9000,
-        9001,
         8080,
         3306,
         5432
     ]
-}
\ No newline at end of file
+}
diff --git a/.devcontainer/docker-compose.override.yml b/.devcontainer/docker-compose.override.yml
index a9d2ab587a9..f29e8b7b69d 100644
--- a/.devcontainer/docker-compose.override.yml
+++ b/.devcontainer/docker-compose.override.yml
@@ -1,19 +1,33 @@
 version: "3.3"
 services:
 
+  # Override nginx to use devcontainer-specific config (upstream: codespace:3000)
+  nginx:
+    volumes:
+      - .devcontainer/images/nginx/conf-devcontainer/nginx.conf:/usr/local/nginx/conf/nginx.conf:ro
+      - ./tmp:/tmp
+
   # Dev Container
   codespace:
     container_name: codespace
     build:
       context: ./
       dockerfile: .devcontainer/images/devcontainer/Dockerfile
+      args:
+        # Use major.minor from .ruby-version (e.g., 3.3.10 -> 3.3)
+        RUBY_VERSION: "3.3"
     restart: unless-stopped
     command: /bin/sh -c "while sleep 1000; do :; done"
     volumes:
       - .:/workspace:cached
-      - /var/run/docker.sock:/var/run/docker.sock
-    network_mode: host
+      # Cache rvm gems in a named volume - persists between rebuilds
+      - rvm-gems-cache:/usr/local/rvm/gems:cached
+    networks:
+      - cc-net
     cap_add:
       - SYS_PTRACE
     security_opt:
       - seccomp:unconfined
+
+volumes:
+  rvm-gems-cache:
diff --git a/.devcontainer/images/devcontainer/Dockerfile b/.devcontainer/images/devcontainer/Dockerfile
index 13c83c04fae..825876eadca 100644
--- a/.devcontainer/images/devcontainer/Dockerfile
+++ b/.devcontainer/images/devcontainer/Dockerfile
@@ -1,7 +1,9 @@
-FROM mcr.microsoft.com/vscode/devcontainers/ruby:3.2
+ARG RUBY_VERSION=3.3
+FROM mcr.microsoft.com/vscode/devcontainers/ruby:${RUBY_VERSION}
 
-COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/
+# Docker CLI and compose are installed by the docker-outside-of-docker feature
 COPY .devcontainer/images/devcontainer/setup.sh /tmp/setup.sh
-COPY .ruby-version /tmp/.ruby-version
 USER vscode
-RUN /tmp/setup.sh && sudo rm /tmp/setup.sh /tmp/.ruby-version
+RUN /tmp/setup.sh && sudo rm /tmp/setup.sh && sudo chmod 1777 /tmp
+
+WORKDIR /workspace
diff --git a/.devcontainer/images/devcontainer/setup.sh b/.devcontainer/images/devcontainer/setup.sh
index 64ac33c39ba..f19873a6d7d 100755
--- a/.devcontainer/images/devcontainer/setup.sh
+++ b/.devcontainer/images/devcontainer/setup.sh
@@ -1,59 +1,106 @@
 #!/bin/bash
-set -Eeuo pipefail
-# shellcheck disable=SC2064
-trap "pkill -P $$" EXIT
+set -eo pipefail
 
 setupAptPackages () {
-  # CF CLI is not available for aarch64 :(
-  if [[ $(uname -m) == aarch64 ]]; then
-    PACKAGES="postgresql-client postgresql-client-common mariadb-client ruby-dev"
-  else
-    PACKAGES="cf8-cli postgresql-client postgresql-client-common mariadb-client ruby-dev"
-  fi
+  PACKAGES="postgresql-client postgresql-client-common mariadb-client ruby-dev direnv"
 
-  wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add -
-  echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
+  echo "Installing packages: $PACKAGES"
   sudo apt-get update
   export DEBIAN_FRONTEND="noninteractive" && echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
   sudo apt-get install -o Dpkg::Options::="--force-overwrite" $PACKAGES -y
+
+  echo "✓ Packages installed successfully"
 }
 
-setupRuby () {
-  rbenv install $(cat /tmp/.ruby-version)
-  rbenv global $(cat /tmp/.ruby-version)
+setupCfCli () {
+  echo "Installing CF CLI v8..."
+  ARCH=$(uname -m)
+
+  if [[ "$ARCH" == "x86_64" ]]; then
+    CF_ARCH="linux64"
+  elif [[ "$ARCH" == "aarch64" ]]; then
+    CF_ARCH="linuxarm64"
+  else
+    echo "⚠️  Unsupported architecture: $ARCH"
+    return 1
+  fi
+
+  local tmp_dir=$(mktemp -d)
+  cd "$tmp_dir"
+
+  echo "Downloading CF CLI for ${CF_ARCH}..."
+  if curl -L -f "https://packages.cloudfoundry.org/stable?release=${CF_ARCH}-binary&version=v8&source=github" | tar -xz; then
+    sudo mv cf8 /usr/local/bin/cf8
+    sudo chmod +x /usr/local/bin/cf8
+    sudo ln -sf /usr/local/bin/cf8 /usr/local/bin/cf
+    echo "✓ CF CLI installed: $(cf version)"
+  else
+    echo "⚠️  CF CLI installation failed"
+    return 1
+  fi
+
+  cd - > /dev/null
+  rm -rf "$tmp_dir"
 }
 
 setupRubyGems () {
-  gem install cf-uaac
+  # Install development tools
+  gem install solargraph cf-uaac
+  echo "✓ Ruby gems installed (solargraph, cf-uaac)"
 }
 
 setupCredhubCli () {
-  set -x
-  wget "$(curl -s https://api.github.com/repos/cloudfoundry/credhub-cli/releases/latest |
-  jq -r '.assets[] | select(.name|match("credhub-linux.*")) | .browser_download_url')" -O /tmp/credhub.tar.gz
-  cd /tmp
-  sudo tar -xzf /tmp/credhub.tar.gz && sudo rm -f /tmp/credhub.tar.gz && sudo mv /tmp/credhub /usr/bin
+  echo "Installing credhub CLI..."
+  local download_url
+  download_url=$(curl -s https://api.github.com/repos/cloudfoundry/credhub-cli/releases/latest | jq -r '.assets[] | select(.name|match("credhub-linux-amd64.*\\.tgz$")) | .browser_download_url')
+
+  if [[ -n "$download_url" ]]; then
+    wget "$download_url" -O /tmp/credhub.tar.gz
+    cd /tmp
+    sudo tar -xzf /tmp/credhub.tar.gz
+    sudo rm -f /tmp/credhub.tar.gz
+    sudo mv /tmp/credhub /usr/bin
+    echo "✓ Credhub CLI installed"
+  else
+    echo "⚠️  Could not find credhub download URL, skipping"
+  fi
 }
 
 setupYqCli () {
-  sudo wget "$(curl -s https://api.github.com/repos/mikefarah/yq/releases/latest |
-  jq -r '.assets[] | select(.name|match("linux_amd64$")) | .browser_download_url')" -O /usr/bin/yq
-  sudo chmod +x /usr/bin/yq
+  echo "Installing yq CLI..."
+  local download_url
+  download_url=$(curl -s https://api.github.com/repos/mikefarah/yq/releases/latest | jq -r '.assets[] | select(.name|match("linux_amd64$")) | .browser_download_url')
+
+  if [[ -n "$download_url" ]]; then
+    sudo wget "$download_url" -O /usr/bin/yq
+    sudo chmod +x /usr/bin/yq
+    echo "✓ yq CLI installed"
+  else
+    echo "⚠️  Could not find yq download URL, skipping"
+  fi
 }
 
-echo """
+# Setup bashrc
+cat > ~/.bashrc << 'EOF'
 export COMPOSE_DOCKER_CLI_BUILD=1
 export DOCKER_BUILDKIT=1
-""" > ~/.bashrc
+
+# Initialize rvm (from base image)
+source /usr/local/rvm/scripts/rvm
+
+eval "$(direnv hook bash)"
+
+# CF CLI helper - targets local nginx proxy
+alias cflogin='cf api http://nginx --skip-ssl-validation && cf auth ccadmin secret'
+EOF
+
+echo "=== Setting up devcontainer ==="
+echo "Using Ruby: $(ruby --version)"
 
 setupAptPackages
-setupRuby
+setupCfCli
 setupRubyGems
-setupCredhubCli
-setupYqCli
-
-# Setup User Permissions
-sudo groupadd docker
-sudo usermod -aG docker "vscode"
+setupCredhubCli || true
+setupYqCli || true
 
-trap "" EXIT
\ No newline at end of file
+echo "=== Devcontainer setup complete ==="
diff --git a/.devcontainer/images/nginx/conf-devcontainer/nginx.conf b/.devcontainer/images/nginx/conf-devcontainer/nginx.conf
new file mode 100644
index 00000000000..bd5f7b5be17
--- /dev/null
+++ b/.devcontainer/images/nginx/conf-devcontainer/nginx.conf
@@ -0,0 +1,54 @@
+worker_processes auto;
+pid /tmp/nginx.pid;
+
+events {
+        worker_connections 768;
+}
+
+http {
+
+        ##
+        # Basic Settings
+        ##
+
+        log_format main  '$host - [$time_local] "$request" $status $bytes_sent "$http_referer" "$http_user_agent" $proxy_add_x_forwarded_for vcap_request_id:$upstream_http_x_vcap_request_id response_time:$upstream_response_time';
+
+        sendfile             on;  #enable use of sendfile()
+        sendfile_max_chunk   1M;  #make sure not to block on fast clients reading large files
+        tcp_nopush           on;
+        tcp_nodelay          on;  #disable nagel's algorithm
+
+        keepalive_timeout    75 20;
+
+        limit_req_status 429;
+
+        client_max_body_size 15M; #already enforced upstream/but doesn't hurt.
+
+        include mime.types;
+        default_type application/octet-stream;
+
+        ##
+        # Logging Settings
+        ##
+
+        access_log /tmp/nginx-access.log;
+        error_log /tmp/nginx-error.log;
+
+        ##
+        # Virtual Host Configs
+        ##
+
+        # Cloud Controller upstream - devcontainer version
+        # CC runs inside the devcontainer, accessible as 'codespace' from other containers
+        upstream cloud_controller {
+                server codespace:3000;
+        }
+
+        map $upload_tmp_path $upload_tmp_path_modified {
+          default                    "n/a";
+          "~^/tmp/(?<path>.*)$"  $path;
+        }
+
+        include nginx_external_endpoints.conf;
+
+}
\ No newline at end of file
diff --git a/.devcontainer/images/nginx/conf/nginx.conf b/.devcontainer/images/nginx/conf/nginx.conf
index 48edbaf8ea1..6d650bffdd7 100644
--- a/.devcontainer/images/nginx/conf/nginx.conf
+++ b/.devcontainer/images/nginx/conf/nginx.conf
@@ -38,6 +38,9 @@ http {
         # Virtual Host Configs
         ##
 
+        # Cloud Controller upstream
+        # Default: host.docker.internal for local dev (CC runs on host)
+        # Devcontainer overrides this via volume mount to use codespace:3000
         upstream cloud_controller {
                 server host.docker.internal:3000;
         }
diff --git a/.devcontainer/images/seaweedfs/s3.json b/.devcontainer/images/seaweedfs/s3.json
new file mode 100644
index 00000000000..36b4995652b
--- /dev/null
+++ b/.devcontainer/images/seaweedfs/s3.json
@@ -0,0 +1,30 @@
+{
+  "identities": [
+    {
+      "name": "anonymous",
+      "actions": [
+        "Read",
+        "Write",
+        "List",
+        "Tagging",
+        "Admin"
+      ]
+    },
+    {
+      "name": "any",
+      "credentials": [
+        {
+          "accessKey": "any",
+          "secretKey": "any"
+        }
+      ],
+      "actions": [
+        "Read",
+        "Write",
+        "List",
+        "Tagging",
+        "Admin"
+      ]
+    }
+  ]
+}
diff --git a/.devcontainer/scripts/cc-containers b/.devcontainer/scripts/cc-containers
new file mode 100755
index 00000000000..ce1a641d7f8
--- /dev/null
+++ b/.devcontainer/scripts/cc-containers
@@ -0,0 +1,41 @@
+#!/bin/bash
+# Manage Docker containers for Cloud Controller development
+#
+# Usage: cc-containers <command> [args]
+#
+# Commands:
+#   start [profile]   Start containers (default: dev)
+#   stop              Stop all containers
+#   status            Show container status
+#   logs [service]    Follow logs (all or specific service)
+#
+# Profiles:
+#   dev (default)     DBs + UAA + nginx (typical development)
+#   minimal           UAA + nginx only (for local brew DBs)
+#   full              All services including diego mocks
+#   s3                Dev + SeaweedFS (S3 blobstore, local only)
+#
+# Examples:
+#   cc-containers start           # Start dev profile
+#   cc-containers start minimal   # Just UAA + nginx
+#   cc-containers logs nginx      # Follow nginx logs
+
+set -e
+export COMPOSE_PROJECT_NAME=cloud_controller_ng
+
+[ -z "$1" ] && { head -20 "$0" | tail -18; exit 1; }
+
+case "$1" in
+  start)
+    case "${2:-dev}" in
+      dev)     docker compose --profile dev up -d --no-recreate ;;
+      minimal) docker compose up -d --no-recreate ;;
+      full)    docker compose --profile dev --profile broker --profile s3 --profile diego up -d --no-recreate ;;
+      s3)      docker compose --profile dev --profile s3 up -d --no-recreate ;;
+      *)       echo "Unknown profile: $2"; exit 1 ;;
+    esac ;;
+  stop)   docker compose --profile dev --profile broker --profile s3 --profile diego down ;;
+  status) docker compose --profile dev --profile broker --profile s3 --profile diego ps ;;
+  logs)   shift; docker compose --profile dev --profile broker --profile s3 --profile diego logs -f "$@" ;;
+  *)      echo "Unknown command: $1"; exit 1 ;;
+esac
diff --git a/.devcontainer/scripts/cc-db-env b/.devcontainer/scripts/cc-db-env
new file mode 100755
index 00000000000..1b682d2ae10
--- /dev/null
+++ b/.devcontainer/scripts/cc-db-env
@@ -0,0 +1,89 @@
+#!/bin/bash
+# Database environment configuration for Cloud Controller
+#
+# Usage: eval "$(cc-db-env <db> <schema>)"
+#
+# Arguments:
+#   <db>      Database type: psql or mysql
+#   <schema>  Database schema: ccdb, test, or custom name
+#
+# Special schemas:
+#   ccdb      Single database for running Cloud Controller
+#   test      Parallel test databases (sets connection prefixes, not DB_CONNECTION_STRING)
+#
+# Examples:
+#   eval "$(cc-db-env psql ccdb)"           # Run CC with PostgreSQL
+#   eval "$(cc-db-env mysql ccdb)"          # Run CC with MySQL
+#   eval "$(cc-db-env psql test)"           # Parallel tests with PostgreSQL
+#   eval "$(cc-db-env mysql test)"          # Parallel tests with MySQL
+#   eval "$(cc-db-env psql my-experiment)"  # Custom PostgreSQL database
+
+set -e
+
+db="${1:-}"
+schema="${2:-}"
+
+if [ "$db" = "status" ]; then
+  echo "DB=${DB:-<not set>}"
+  echo "DB_CONNECTION_STRING=${DB_CONNECTION_STRING:-<not set>}"
+  echo "POSTGRES_CONNECTION_PREFIX=${POSTGRES_CONNECTION_PREFIX:-<not set>}"
+  echo "MYSQL_CONNECTION_PREFIX=${MYSQL_CONNECTION_PREFIX:-<not set>}"
+  echo "CLOUD_CONTROLLER_NG_CONFIG=${CLOUD_CONTROLLER_NG_CONFIG:-<not set>}"
+  exit 0
+fi
+
+if [ -z "$db" ] || [ -z "$schema" ]; then
+  >&2 echo "Usage: eval \"\$(cc-db-env <db> <schema>)\" or cc-db-env status"
+  >&2 echo "  db: psql, mysql    schema: ccdb, test, or custom"
+  exit 1
+fi
+
+pg_host="${DEVCONTAINER:+postgres}"; pg_host="${pg_host:-localhost}"
+mysql_host="${DEVCONTAINER:+mysql}"; mysql_host="${mysql_host:-127.0.0.1}"
+cc_config="${CC_CONFIG:-local}"
+
+case "$db" in
+  psql|postgres)
+    case "$schema" in
+      test)
+        cat <<EOF
+export DB="postgres"
+export POSTGRES_CONNECTION_PREFIX="postgres://postgres:supersecret@${pg_host}:5432"
+unset DB_CONNECTION_STRING MYSQL_CONNECTION_PREFIX CLOUD_CONTROLLER_NG_CONFIG
+EOF
+        >&2 echo "✓ psql test"
+        ;;
+      *)
+        cat <<EOF
+export DB="postgres"
+export DB_CONNECTION_STRING="postgres://postgres:supersecret@${pg_host}:5432/${schema}"
+export CLOUD_CONTROLLER_NG_CONFIG="tmp/.dev-generated/cloud_controller.${cc_config}.yml"
+unset POSTGRES_CONNECTION_PREFIX MYSQL_CONNECTION_PREFIX
+EOF
+        >&2 echo "✓ psql ${schema}"
+        ;;
+    esac
+    ;;
+  mysql)
+    case "$schema" in
+      test)
+        cat <<EOF
+export DB="mysql"
+export MYSQL_CONNECTION_PREFIX="mysql2://root:supersecret@${mysql_host}:3306"
+unset DB_CONNECTION_STRING POSTGRES_CONNECTION_PREFIX CLOUD_CONTROLLER_NG_CONFIG
+EOF
+        >&2 echo "✓ mysql test"
+        ;;
+      *)
+        cat <<EOF
+export DB="mysql"
+export DB_CONNECTION_STRING="mysql2://root:supersecret@${mysql_host}:3306/${schema}"
+export CLOUD_CONTROLLER_NG_CONFIG="tmp/.dev-generated/cloud_controller.${cc_config}.yml"
+unset POSTGRES_CONNECTION_PREFIX MYSQL_CONNECTION_PREFIX
+EOF
+        >&2 echo "✓ mysql ${schema}"
+        ;;
+    esac
+    ;;
+  *) >&2 echo "Error: Unknown database type: $db (use psql or mysql)"; exit 1 ;;
+esac
diff --git a/.devcontainer/scripts/cc-generate-config b/.devcontainer/scripts/cc-generate-config
new file mode 100755
index 00000000000..e6672fdc82d
--- /dev/null
+++ b/.devcontainer/scripts/cc-generate-config
@@ -0,0 +1,101 @@
+#!/usr/bin/env ruby
+# Usage: cc-generate-config [mode] [name]
+# Modes: local-temp-storage (default), local, storage-cli
+# Name: custom config name (e.g., "cc2" generates cloud_controller.cc2.yml)
+require 'yaml'
+require 'oj'
+require 'fileutils'
+
+APP_ROOT = if File.exist?('.devcontainer/scripts/cc-generate-config')
+             Dir.pwd
+           elsif File.exist?('../../config/cloud_controller.yml')
+             File.expand_path('../..', __dir__)
+           else
+             abort 'Error: Run from repository root'
+           end
+Dir.chdir(APP_ROOT)
+
+mode = 'local-temp-storage'
+custom_name = nil
+ARGV.each do |arg|
+  if %w[local-temp-storage local storage-cli].include?(arg) then mode = arg
+  elsif ['-h', '--help'].include?(arg)
+    puts "Usage: cc-generate-config [mode] [name]\nModes: local-temp-storage, local, storage-cli\nName: custom config name (generates cloud_controller.<name>.yml)"
+    exit 0
+  else
+    custom_name = arg
+  end
+end
+
+HOSTS = {
+  'devcontainer' => { 'external_domain' => 'nginx', 'uaa' => 'uaa', 'seaweedfs' => 'seaweedfs' },
+  'local' => { 'external_domain' => 'localhost', 'uaa' => 'localhost', 'seaweedfs' => 'localhost' }
+}.freeze
+
+def generate_config(mode, hosts)
+  config = YAML.load_file('config/cloud_controller.yml')
+
+  config['external_domain'] = hosts['external_domain']
+  config['system_domain'] = '127.0.0.1.nip.io'
+  config['external_port'] = 3000
+  config['login']['url'] = "http://#{hosts['uaa']}:8080"
+  config['uaa']['url'] = "http://#{hosts['uaa']}:8080"
+  config['uaa']['internal_url'] = "http://#{hosts['uaa']}:8080"
+  config['uaa']['resource_id'] = 'cloud_controller'
+  config['uaa'].delete('symmetric_secret')
+  config['cloud_controller_username_lookup_client_name'] = 'login'
+  config['cloud_controller_username_lookup_client_secret'] = 'loginsecret'
+  config['diego']['bbs']['url'] = 'http://127.0.0.1:1234'
+  config['diego']['bbs']['key_file'] = 'spec/fixtures/certs/bbs_client.key'
+  config['diego']['bbs']['cert_file'] = 'spec/fixtures/certs/bbs_client.crt'
+  config['diego']['bbs']['ca_file'] = 'spec/fixtures/certs/bbs_ca.crt'
+  config['nginx']['use_nginx'] = true
+  config['nginx']['instance_socket'] = ''
+  config['logging']['file'] = 'tmp/cloud_controller.log'
+  config['telemetry_log_path'] = 'tmp/cloud_controller_telemetry.log'
+  config['directories']['tmpdir'] = "#{Dir.pwd}/tmp"
+  config['directories']['diagnostics'] = 'tmp'
+  config['security_event_logging']['enabled'] = true
+  config['security_event_logging']['file'] = 'tmp/cef.log'
+  config['packages']['max_package_size'] = 2_147_483_648
+
+  case mode
+  when 'local'
+    blobstore_path = "#{Dir.pwd}/tmp/blobstore"
+    FileUtils.mkdir_p(blobstore_path)
+    %w[resource_pool packages droplets buildpacks].each do |store|
+      config[store]['blobstore_type'] = 'local'
+      config[store]['local_blobstore_path'] = blobstore_path
+      config[store]['fog_connection'] = {}
+    end
+  when 'storage-cli'
+    config_dir = "#{Dir.pwd}/tmp/.dev-generated/storage_cli_configs"
+    FileUtils.mkdir_p(config_dir)
+    { 'resource_pool' => 'cc-resources', 'packages' => 'cc-packages', 'droplets' => 'cc-droplets', 'buildpacks' => 'cc-buildpacks' }.each do |store, bucket|
+      File.write("#{config_dir}/#{store}.json",
+                 Oj.dump(
+                   { 'provider' => 's3', 'credentials_source' => 'static', 'host' => "http://#{hosts['seaweedfs']}:8333", 'bucket_name' => bucket, 'access_key_id' => 'any',
+                     'secret_access_key' => 'any', 'region' => 'us-east-1' }, mode: :compat, indent: 2
+                 ))
+      config[store]['blobstore_type'] = 'storage-cli'
+      config[store]['fog_connection'] = {}
+      config[store].delete('local_blobstore_path')
+      config["storage_cli_config_file_#{store}"] = "#{config_dir}/#{store}.json"
+    end
+  end
+  config
+end
+
+output_dir = "#{Dir.pwd}/tmp/.dev-generated"
+FileUtils.mkdir_p(output_dir)
+
+if custom_name
+  env_name = ENV['DEVCONTAINER'] ? 'devcontainer' : 'local'
+  File.write("#{output_dir}/cloud_controller.#{custom_name}.yml", YAML.dump(generate_config(mode, HOSTS[env_name])))
+  puts "✓ tmp/.dev-generated/cloud_controller.#{custom_name}.yml"
+else
+  HOSTS.each do |env_name, hosts|
+    File.write("#{output_dir}/cloud_controller.#{env_name}.yml", YAML.dump(generate_config(mode, hosts)))
+    puts "✓ tmp/.dev-generated/cloud_controller.#{env_name}.yml"
+  end
+end
diff --git a/.devcontainer/scripts/cc-install-storage-cli b/.devcontainer/scripts/cc-install-storage-cli
new file mode 100755
index 00000000000..3dee652626c
--- /dev/null
+++ b/.devcontainer/scripts/cc-install-storage-cli
@@ -0,0 +1,51 @@
+#!/bin/bash
+set -euo pipefail
+
+# Install storage-cli binary for S3 blobstore testing
+# Downloads to tmp/bin/storage-cli
+
+INSTALL_DIR="${INSTALL_DIR:-$(pwd)/tmp/bin}"
+GITHUB_REPO="cloudfoundry/storage-cli"
+
+# Detect platform
+case "$(uname -s)-$(uname -m)" in
+  Linux-x86_64)   platform="linux-amd64" ;;
+  Linux-aarch64)  platform="linux-arm64" ;;
+  Darwin-x86_64)  platform="darwin-amd64" ;;
+  Darwin-arm64)   platform="darwin-arm64" ;;
+  *)
+    echo "Error: Unsupported platform: $(uname -s)-$(uname -m)"
+    exit 1
+    ;;
+esac
+
+# Get latest version
+version=$(curl -sL "https://api.github.com/repos/${GITHUB_REPO}/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+version_number="${version#v}"
+
+# Check if already installed
+if [[ -x "${INSTALL_DIR}/storage-cli" ]]; then
+  installed=$("${INSTALL_DIR}/storage-cli" -v 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' || echo "")
+  if [[ "$installed" == "$version_number" ]]; then
+    echo "✓ storage-cli ${version} already installed at ${INSTALL_DIR}/storage-cli"
+    exit 0
+  fi
+fi
+
+# Download
+mkdir -p "${INSTALL_DIR}"
+url="https://github.com/${GITHUB_REPO}/releases/download/${version}/storage-cli-${version_number}-${platform}"
+echo "Downloading storage-cli ${version} for ${platform}..."
+
+if ! curl -sL --fail -o "${INSTALL_DIR}/storage-cli" "$url"; then
+  echo "Error: Failed to download from $url"
+  exit 1
+fi
+
+chmod +x "${INSTALL_DIR}/storage-cli"
+echo "✓ Installed to ${INSTALL_DIR}/storage-cli"
+echo ""
+echo "Next steps:"
+echo "  export STORAGE_CLI_PATH=\"\$(pwd)/tmp/bin/storage-cli\""
+echo "  cc-containers start s3"
+echo "  cc-generate-config storage-cli"
diff --git a/.devcontainer/scripts/cc-reset-db b/.devcontainer/scripts/cc-reset-db
new file mode 100755
index 00000000000..f42f9e3eaa6
--- /dev/null
+++ b/.devcontainer/scripts/cc-reset-db
@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+# Usage: cc-reset-db [DB=postgres|mysql]
+APP_ROOT = if ENV['DEVCONTAINER']
+             '/workspace'
+           else
+             (File.exist?('Gemfile') ? Dir.pwd : File.expand_path('../../..', __dir__))
+           end
+abort 'Error: Run from repository root' unless APP_ROOT && File.exist?("#{APP_ROOT}/Gemfile")
+
+def run!(cmd)
+  puts "Running: #{cmd}"
+  Dir.chdir(APP_ROOT) { system(cmd, exception: true) }
+end
+
+db = ENV['DB'] ||= 'postgres'
+pg_host = ENV['DEVCONTAINER'] ? 'postgres' : 'localhost'
+mysql_host = ENV['DEVCONTAINER'] ? 'mysql' : '127.0.0.1'
+
+puts "== Resetting #{db} databases =="
+
+begin
+  ENV.delete('DB_CONNECTION_STRING')
+  ENV[db == 'postgres' ? 'POSTGRES_CONNECTION_PREFIX' : 'MYSQL_CONNECTION_PREFIX'] =
+    db == 'postgres' ? "postgres://postgres:supersecret@#{pg_host}:5432" : "mysql2://root:supersecret@#{mysql_host}:3306"
+
+  run! 'bundle exec rake parallel:drop parallel:create db:parallel:migrate'
+
+  ENV['DB_CONNECTION_STRING'] = if db == 'postgres'
+                                  "postgres://postgres:supersecret@#{pg_host}:5432/ccdb"
+                                else
+                                  "mysql2://root:supersecret@#{mysql_host}:3306/ccdb"
+                                end
+
+  run! 'bundle exec rake db:recreate db:migrate db:seed'
+  puts '✓ Done'
+rescue StandardError => e
+  abort "Failed: #{e.message}\nMake sure containers are running: cc-containers start"
+end
diff --git a/.devcontainer/scripts/cc-setup-devcontainer b/.devcontainer/scripts/cc-setup-devcontainer
new file mode 100755
index 00000000000..36ae04aa081
--- /dev/null
+++ b/.devcontainer/scripts/cc-setup-devcontainer
@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+# One-time setup for devcontainer/codespaces only
+abort 'For local dev: bundle install && cc-generate-config && cc-reset-db' unless ENV['DEVCONTAINER']
+
+Dir.chdir('/workspace')
+def run(cmd) = system(cmd) || abort("Failed: #{cmd}")
+def quiet(cmd) = system(cmd, out: File::NULL, err: File::NULL)
+
+puts '== Devcontainer Setup =='
+
+# Bundle
+system 'bundle config set --local jobs 4'
+quiet('bundle check') ? puts('Bundle OK') : run('bundle install')
+
+# Config
+run "cc-generate-config #{ENV['BLOBSTORE_MODE'] || 'local-temp-storage'}"
+
+# Wait for DB
+db = ENV['DB'] ||= 'postgres'
+db_cmd = db == 'postgres' ? 'PGPASSWORD=supersecret psql -h postgres -U postgres -c "SELECT 1"' : 'mysql -h mysql -u root -psupersecret -e "SELECT 1"'
+print "Waiting for #{db}..."
+60.times do
+  break if quiet(db_cmd)
+
+  print '.'
+  sleep 2
+end
+abort "\nDB not ready" unless quiet(db_cmd)
+puts ' ready'
+
+# Setup DBs
+run 'cc-reset-db'
+puts '✓ Done. Run: eval "$(cc-db-env psql ccdb)" && cloud_controller -c tmp/.dev-generated/cloud_controller.devcontainer.yml'
diff --git a/.devcontainer/scripts/cc-setup-ide b/.devcontainer/scripts/cc-setup-ide
new file mode 100755
index 00000000000..577b3bc6483
--- /dev/null
+++ b/.devcontainer/scripts/cc-setup-ide
@@ -0,0 +1,37 @@
+#!/bin/bash
+# Copy IDE configurations from templates to workspace root
+# Copies files without overwriting existing ones
+set -e
+
+cd "$(dirname "$0")/../.."
+
+echo "Copying IDE configurations (existing files preserved)..."
+
+# VS Code - copy individual files to not overwrite user customizations
+mkdir -p .vscode
+for file in .devcontainer/configs/vscode/.vscode/*; do
+    dest=".vscode/$(basename "$file")"
+    if [ ! -e "$dest" ]; then
+        cp -a "$file" "$dest"
+        echo "  Copied: $dest"
+    fi
+done
+
+# IntelliJ - copy runConfigurations and inspectionProfiles
+mkdir -p .idea/runConfigurations .idea/inspectionProfiles
+for file in .devcontainer/configs/intellij/.idea/runConfigurations/*; do
+    dest=".idea/runConfigurations/$(basename "$file")"
+    if [ ! -e "$dest" ]; then
+        cp -a "$file" "$dest"
+        echo "  Copied: $dest"
+    fi
+done
+for file in .devcontainer/configs/intellij/.idea/inspectionProfiles/*; do
+    dest=".idea/inspectionProfiles/$(basename "$file")"
+    if [ ! -e "$dest" ]; then
+        cp -a "$file" "$dest"
+        echo "  Copied: $dest"
+    fi
+done
+
+echo "✓ Done"
diff --git a/.devcontainer/scripts/codespaces_init.sh b/.devcontainer/scripts/codespaces_init.sh
deleted file mode 100755
index c9aa8f38683..00000000000
--- a/.devcontainer/scripts/codespaces_init.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-set -Eeuxo pipefail
-set -o allexport
-# shellcheck disable=SC2064
-trap "pkill -P $$" EXIT
-
-# Setup volume mounts
-mkdir -p tmp
-
-# Speed up docker builds by prebuilding with buildx
-docker-compose pull || tee tmp/fail &
-docker buildx bake -f docker-compose.yml -f .devcontainer/docker-compose.override.yml || tee tmp/fail &
-
-wait $(jobs -p)
-test -f tmp/fail && rm tmp/fail && exit 1
-
-trap "" EXIT
\ No newline at end of file
diff --git a/.devcontainer/scripts/codespaces_start.sh b/.devcontainer/scripts/codespaces_start.sh
deleted file mode 100755
index 6934883c137..00000000000
--- a/.devcontainer/scripts/codespaces_start.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -Eeuxo pipefail
-# shellcheck disable=SC2064
-trap "pkill -P $$" EXIT
-
-# Setup IDEs
-./.devcontainer/scripts/setupIDEs.sh
-
-# Setup DBs and CC Config File
-./.devcontainer/scripts/setupDevelopmentEnvironment.sh
-
-trap "" EXIT
\ No newline at end of file
diff --git a/.devcontainer/scripts/setupDevelopmentEnvironment.sh b/.devcontainer/scripts/setupDevelopmentEnvironment.sh
deleted file mode 100755
index d4522b8ec5e..00000000000
--- a/.devcontainer/scripts/setupDevelopmentEnvironment.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/bash
-set -Eeuo pipefail
-# shellcheck disable=SC2064
-trap "pkill -P $$" EXIT
-
-# Database Information
-POSTGRES_CONNECTION_PREFIX="postgres://postgres:supersecret@localhost:5432"
-MYSQL_CONNECTION_PREFIX="mysql2://root:supersecret@127.0.0.1:3306"
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-setupPostgres () {
-    export DB="postgres"
-    # Parallel Test DBs
-    export POSTGRES_CONNECTION_PREFIX
-    bundle exec rake db:pick db:parallel:recreate
-    # Sequential Test DBs
-    export PGPASSWORD=supersecret
-    psql -U postgres -h localhost -tc "SELECT 1 FROM pg_database WHERE datname = 'cc_test'" | grep -q 1 || psql -U postgres -h localhost -c "CREATE DATABASE cc_test"
-    psql -U postgres -h localhost -tc "SELECT 1 FROM pg_database WHERE datname = 'diego'" | grep -q 1 || psql -U postgres -h localhost -c "CREATE DATABASE diego"
-    psql -U postgres -h localhost -tc "SELECT 1 FROM pg_database WHERE datname = 'locket'" | grep -q 1 || psql -U postgres -h localhost -c "CREATE DATABASE locket"
-    # Main DB
-    export DB_CONNECTION_STRING="${POSTGRES_CONNECTION_PREFIX}/ccdb"
-    bundle exec rake db:recreate db:migrate db:seed
-}
-
-setupMariadb () {
-    export DB="mysql"
-    # Parallel Test DBs
-    export MYSQL_CONNECTION_PREFIX
-    bundle exec rake db:pick db:parallel:recreate
-    # Sequential Test DBs
-    mysql -h 127.0.0.1 -u root -psupersecret -e "CREATE DATABASE IF NOT EXISTS cc_test; CREATE DATABASE IF NOT EXISTS diego; CREATE DATABASE IF NOT EXISTS locket;"
-    # Main DB
-    export DB_CONNECTION_STRING="${MYSQL_CONNECTION_PREFIX}/ccdb"
-    bundle exec rake db:recreate db:migrate db:seed
-}
-
-# Install packages
-bundle config set --local with 'debug'
-bundle install
-
-# Setup Containers
-setupPostgres || tee tmp/fail &
-setupMariadb || tee tmp/fail &
-
-# CC config
-mkdir -p tmp
-cp -a config/cloud_controller.yml tmp/cloud_controller.yml
-
-yq -i e '.external_domain="localhost"' tmp/cloud_controller.yml
-yq -i e '.system_domain="localhost"' tmp/cloud_controller.yml
-
-yq -i e '.login.url="http://localhost:8080"' tmp/cloud_controller.yml
-yq -i e '.login.enabled=true' tmp/cloud_controller.yml
-
-yq -i e '.nginx.use_nginx=true' tmp/cloud_controller.yml
-yq -i e '.nginx.instance_socket=""' tmp/cloud_controller.yml
-
-yq -i e '.logging.file="tmp/cloud_controller.log"' tmp/cloud_controller.yml
-yq -i e '.telemetry_log_path="tmp/cloud_controller_telemetry.log"' tmp/cloud_controller.yml
-TMPDIR=$(pwd)/tmp yq -i e '.directories.tmpdir=env(TMPDIR)' tmp/cloud_controller.yml;
-yq -i e '.directories.diagnostics="tmp"' tmp/cloud_controller.yml
-yq -i e '.security_event_logging.enabled=true' tmp/cloud_controller.yml
-yq -i e '.security_event_logging.file="tmp/cef.log"' tmp/cloud_controller.yml
-
-yq -i e '.uaa.url="http://localhost:8080"' tmp/cloud_controller.yml
-yq -i e '.uaa.internal_url="http://localhost:8080"' tmp/cloud_controller.yml
-yq -i e '.uaa.resource_id="cloud_controller"' tmp/cloud_controller.yml
-yq -i e 'del(.uaa.symmetric_secret)' tmp/cloud_controller.yml
-
-yq -i e '.resource_pool.fog_connection.provider="AWS"' tmp/cloud_controller.yml
-yq -i e '.resource_pool.fog_connection.endpoint="http://localhost:9001"' tmp/cloud_controller.yml
-yq -i e '.resource_pool.fog_connection.aws_access_key_id="minioadmin"' tmp/cloud_controller.yml
-yq -i e '.resource_pool.fog_connection.aws_secret_access_key="minioadmin"' tmp/cloud_controller.yml
-yq -i e '.resource_pool.fog_connection.aws_signature_version=2' tmp/cloud_controller.yml
-yq -i e '.resource_pool.fog_connection.path_style=true' tmp/cloud_controller.yml
-
-yq -i e '.packages.fog_connection.provider="AWS"' tmp/cloud_controller.yml
-yq -i e '.packages.fog_connection.endpoint="http://localhost:9001"' tmp/cloud_controller.yml
-yq -i e '.packages.fog_connection.aws_access_key_id="minioadmin"' tmp/cloud_controller.yml
-yq -i e '.packages.fog_connection.aws_secret_access_key="minioadmin"' tmp/cloud_controller.yml
-yq -i e '.packages.fog_connection.aws_signature_version=2' tmp/cloud_controller.yml
-yq -i e '.packages.fog_connection.path_style=true' tmp/cloud_controller.yml
-
-yq -i e '.droplets.fog_connection.provider="AWS"' tmp/cloud_controller.yml
-yq -i e '.droplets.fog_connection.endpoint="http://localhost:9001"' tmp/cloud_controller.yml
-yq -i e '.droplets.fog_connection.aws_access_key_id="minioadmin"' tmp/cloud_controller.yml
-yq -i e '.droplets.fog_connection.aws_secret_access_key="minioadmin"' tmp/cloud_controller.yml
-yq -i e '.droplets.fog_connection.aws_signature_version=2' tmp/cloud_controller.yml
-yq -i e '.droplets.fog_connection.path_style=true' tmp/cloud_controller.yml
-
-yq -i e '.buildpacks.fog_connection.provider="AWS"' tmp/cloud_controller.yml
-yq -i e '.buildpacks.fog_connection.endpoint="http://localhost:9001"' tmp/cloud_controller.yml
-yq -i e '.buildpacks.fog_connection.aws_access_key_id="minioadmin"' tmp/cloud_controller.yml
-yq -i e '.buildpacks.fog_connection.aws_secret_access_key="minioadmin"' tmp/cloud_controller.yml
-yq -i e '.buildpacks.fog_connection.aws_signature_version=2' tmp/cloud_controller.yml
-yq -i e '.buildpacks.fog_connection.path_style=true' tmp/cloud_controller.yml
-
-yq -i e '.cloud_controller_username_lookup_client_name="login"' tmp/cloud_controller.yml
-yq -i e '.cloud_controller_username_lookup_client_secret="loginsecret"' tmp/cloud_controller.yml
-
-yq -i e '.diego.bbs.url="http://127.0.0.1:1234"' tmp/cloud_controller.yml
-yq -i e '.diego.bbs.key_file="spec/fixtures/certs/bbs_client.key"' tmp/cloud_controller.yml
-yq -i e '.diego.bbs.cert_file="spec/fixtures/certs/bbs_client.crt"' tmp/cloud_controller.yml
-yq -i e '.diego.bbs.ca_file="spec/fixtures/certs/bbs_ca.crt"' tmp/cloud_controller.yml
-
-yq -i e '.packages.max_package_size=2147483648' tmp/cloud_controller.yml
-
-# Wait for background jobs and exit 1 if any error happened
-# shellcheck disable=SC2046
-wait $(jobs -p)
-test -f tmp/fail && rm tmp/fail && exit 1
-
-trap "" EXIT
\ No newline at end of file
diff --git a/.devcontainer/scripts/setupIDEs.sh b/.devcontainer/scripts/setupIDEs.sh
deleted file mode 100755
index 19b9a2391b8..00000000000
--- a/.devcontainer/scripts/setupIDEs.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -Eeuo pipefail
-# shellcheck disable=SC2064
-trap "pkill -P $$" EXIT
-
-# Setup IDEs
-cp -a -f .devcontainer/configs/vscode/.vscode .
-cp -a -f .devcontainer/configs/intellij/.idea .
-
-trap "" EXIT
\ No newline at end of file
diff --git a/.envrc b/.envrc
index c75883c52bb..311eb9ee4ff 100644
--- a/.envrc
+++ b/.envrc
@@ -1,4 +1,26 @@
-cores=$(/usr/sbin/sysctl -n hw.logicalcpu)
+# =============================================================================
+# Cloud Controller NG - Development Environment
+# =============================================================================
+#
+# QUICK START (local development):
+#   cc-containers start            # Start DBs, UAA, nginx
+#   bundle install && cc-generate-config && cc-reset-db
+#   eval "$(cc-db-env psql ccdb)"  # Set database env vars
+#   bin/cloud_controller -c tmp/.dev-generated/cloud_controller.local.yml
+#
+# SCRIPTS (all start with 'cc-'):
+#   cc-containers <cmd>            # start/stop/logs/status (see --help)
+#   cc-db-env <db> <schema>        # Database env vars (e.g. psql ccdb, mysql test)
+#   cc-generate-config [mode]      # Generate cloud_controller.yml configs
+#   cc-reset-db                    # Drop and recreate all databases
+#   cc-setup-ide                   # Copy IDE configs (VS Code, IntelliJ)
+#
+# PERSONAL OVERRIDES (.envrc.local, gitignored):
+#   export PARALLEL_TEST_PROCESSORS=4
+#
+# =============================================================================
+
+cores=$(/usr/sbin/sysctl -n hw.logicalcpu 2>/dev/null || nproc 2>/dev/null || echo 4)
 
 if (( cores > 8 )); then
   # This environment variable overrides the `parallel_test` gem's default behavior
@@ -9,4 +31,34 @@ if (( cores > 8 )); then
   export PARALLEL_TEST_PROCESSORS=8
 fi
 
+# Set CC_CONFIG for local development (devcontainer sets CC_CONFIG=devcontainer)
+# This is used by VS Code launch configs to select the right cloud_controller.yml
+export CC_CONFIG="${CC_CONFIG:-local}"
+
+# Database connection prefixes - used by IDE run configs and parallel tests
+# Devcontainer overrides these in devcontainer.json with container hostnames (postgres, mysql)
+export POSTGRES_CONNECTION_PREFIX="${POSTGRES_CONNECTION_PREFIX:-postgres://postgres:supersecret@localhost:5432}"
+export MYSQL_CONNECTION_PREFIX="${MYSQL_CONNECTION_PREFIX:-mysql2://root:supersecret@127.0.0.1:3306}"
+
+# Storage CLI path for S3 blobstore mode
+export STORAGE_CLI_PATH="${PWD}/tmp/bin/storage-cli"
+
 PATH_add bin
+PATH_add .devcontainer/scripts
+
+# =============================================================================
+# Developer Overrides
+# =============================================================================
+if [ -f .envrc.local ]; then
+  source_env .envrc.local
+fi
+
+# Show quick hint on directory entry
+if [ -n "$DEVCONTAINER" ]; then
+  log_status "Cloud Controller NG (devcontainer)"
+  log_status "Quick start: cc-generate-config && eval \"\$(cc-db-env psql ccdb)\""
+else
+  log_status "Cloud Controller NG (local)"
+  log_status "Quick start: cc-containers start && cc-generate-config && cc-reset-db"
+fi
+log_status "See README.md for full setup instructions"
diff --git a/.gitignore b/.gitignore
index 257b0897da2..b5586cfcee9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,12 @@ test.err
 test.out
 !/.devcontainer/**/*
 
+# Dev environment overrides
+.envrc.local
+
+# Generated dev files (safe to delete)
+tmp/.dev-generated/
+
 #DOCS
 docs/v2/index.html
 
diff --git a/Gemfile b/Gemfile
index c21bd683d3f..a29c614d9fc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,6 +93,7 @@ group :development do
   gem 'debug', '~> 1.11'
   gem 'listen'
   gem 'roodi'
+  gem 'ruby-lsp-rspec', require: false
   gem 'solargraph'
   gem 'spring'
   gem 'spring-commands-rspec'
diff --git a/Gemfile.lock b/Gemfile.lock
index 746a1ece9dc..f38bf5fb7b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -502,6 +502,12 @@ GEM
     rubocop-sequel (0.4.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1, < 2)
+    ruby-lsp (0.26.9)
+      language_server-protocol (~> 3.17.0)
+      prism (>= 1.2, < 2.0)
+      rbs (>= 3, < 5)
+    ruby-lsp-rspec (0.1.29)
+      ruby-lsp (~> 0.26.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     ruby_parser (3.22.0)
@@ -672,6 +678,7 @@ DEPENDENCIES
   rubocop-rspec (~> 3.9)
   rubocop-rspec_rails
   rubocop-sequel (~> 0.4.1)
+  ruby-lsp-rspec
   rubyzip (>= 1.3.0)
   sequel (~> 5.102)
   sequel_pg
diff --git a/README.md b/README.md
index 90be40c06eb..f21617bfaf3 100644
--- a/README.md
+++ b/README.md
@@ -34,15 +34,15 @@ When deployed via capi-release only:
 * Droplets: An executable containing an app and its runtime dependencies
 * Buildpacks: Set of programs that transform packages into droplets
 * Buildpack cache: Cached dependencies and build artifacts to speed up future staging
- 
-Cloud Controller currently supports [webdav](http://www.webdav.org/) and the following [fog](http://fog.io) connectors: 
 
-* Alibaba Cloud (Experimental)
-* Azure
-* Openstack
-* Local (NFS)
-* Google
-* AWS
+#### Providers
+
+| Provider | `blobstore_type` | Backends | Notes |
+|----------|------------------|----------|-------|
+| Storage CLI | `storage-cli` | S3, S3-compatible, GCS, Azure, Alibaba Cloud | |
+| Fog | `fog` | AWS, Azure, GCS, Alibaba Cloud, OpenStack, Local/NFS | **Default.** Local/NFS not recommended for production |
+| WebDAV | `webdav` | WebDAV servers | |
+| Local | `local`, `local-temp-storage` | Filesystem, NFS | Development and testing only |
 
 ### Runtime
 
@@ -52,141 +52,183 @@ See [Diego Design Notes](https://github.com/cloudfoundry/diego-design-notes) for
 ## Contributing
 
 Please read the [contributors' guide](https://github.com/cloudfoundry/cloud_controller_ng/blob/main/CONTRIBUTING.md) and the [Cloud Foundry Code of Conduct](https://cloudfoundry.org/code-of-conduct/)
-### Predefined Development Environment
 
-To commence your work in a fully equipped development environment, you have two main options:
+### Development Environment Setup
 
-1. **GitHub Codespaces**: GitHub Codespaces provisions a virtual machine with essential core services, such as S3 Blobstore, Database, and NGINX. It also establishes a connection that your IDE can use (VSCode is recommended). To initiate a codespace, click on the green button within the GitHub UI(upper right corner) and select the 'Codespaces' tab.
+#### Option 1: Devcontainer
 
-2. **Local Environment**: This option allows you to establish an environment on your local machine with the same core services as GitHub Codespaces, using Docker.
+- **GitHub Codespaces:** Click "Code" → "Codespaces" → "Create codespace"
+- **VS Code:** Open folder → "Reopen in Container"
 
-A script in the project's root directory provides convenient shortcuts to set up an environment locally:
+Other IDEs with devcontainer support (e.g., IntelliJ) may work but are not tested.
 
-```
-Usage: ./devenv.sh COMMAND
-
-Commands:
-  create     - Setting up the development environment(containers)
-  start      - Starting the development environment(containers), an existing fully set up set of containers must exist.
-  stop       - Stopping but not removing the development environment(containers)
-  destroy    - Stopping and removing the development environment(containers)
-  runconfigs - Copies matching run configurations for intellij and vscode into the respective folders
-  help       - Print this help text
+Everything autoconfigures. After setup completes, use VS Code's **Run/Debug panel** (see `.vscode/launch.json`) or run manually:
+```bash
+cc-generate-config             # Generate cloud_controller.yml
+eval "$(cc-db-env psql ccdb)"  # Set database env vars
+cloud_controller -c tmp/.dev-generated/cloud_controller.devcontainer.yml
+cflogin                        # Authenticate CF CLI (alias for cf api + auth)
 ```
 
-To run this script, ensure the following are installed on your local system:
+#### Option 2: Local Development
 
-- Ruby (Refer to the .ruby-version file for the correct version)
-- [Bundler](https://bundler.io/)
-- [Docker](https://www.docker.com/) (Feature "Allow privileged port mapping" must be enabled in Avanced Options on Docker Desktop for Mac, docker must be accessable without root permissions)
-- [Docker Compose](https://github.com/docker/compose)
-- [PSQL CLI](https://www.postgresql.org/docs/current/app-psql.html)
-- [MYSQL CLI](https://dev.mysql.com/doc/refman/8.0/en/mysql.html)
-- [UAAC](https://github.com/cloudfoundry/cf-uaac)
-- [yq 4+](https://github.com/mikefarah/yq)
+**Prerequisites:** Ruby (see `.ruby-version` for correct version), [Bundler](https://bundler.io/), [Docker Desktop](https://www.docker.com/products/docker-desktop/), [direnv](https://direnv.net/), [PSQL](https://www.postgresql.org) and/or [MySQL](https://dev.mysql.com/doc/mysql-shell/en/).
 
-Upon executing `./devenv.sh create`, the necessary containers will be set up and the databases will be initialized and migrated. 
+```bash
+direnv allow                    # Enable direnv (adds cc-* scripts to PATH)
+bundle install                  # Install gems
+cc-containers start             # Start DBs + UAA + nginx
+cc-generate-config              # Generate cloud_controller.yml
+eval "$(cc-db-env psql ccdb)"   # Set database env vars
+cc-reset-db                     # (re)create and migrate databases
+cc-setup-ide                    # Copy IDE run/debug configs (optional)
+```
 
-As an optional step, execute `./devenv.sh runconfigs` to copy predefined settings and run configurations for this project into `.vscode` and `.idea` directories for VSCode and IntelliJ/RubyMine/JetBrains IDEs. These configurations are opinionated and, hence, not provided by default, but they do offer common configurations to debug `rspecs`, `cloud_controller`, `local_worker`, and `generic_worker`.
+Then see [Running Cloud Controller](#running-cloud-controller) below.
 
-#### Credentials
+#### Helper Scripts
 
-This Setup automatically creates a user in UAA for login in the cloud_controller, and sets Passwords for Postgres and Mysql.
-In case you need them to configure them somewhere else (e.g. database visualizers):
-- Postgres: postgres:supersecret@localhost:5432
-- MySQL: root:supersecret@127.0.0.1:3306
-- UAA Admin: 
+All scripts are prefixed with `cc-` and added to PATH via direnv:
+
+| Script | Purpose |
+|--------|---------|
+| `cc-containers <cmd>` | Manage Docker containers (see below) |
+| `cc-db-env <db> <schema>` | Set `DB_CONNECTION_STRING` and `CLOUD_CONTROLLER_NG_CONFIG`. Usage: `eval "$(cc-db-env psql ccdb)"` |
+| `cc-generate-config [mode]` | Generate cloud_controller.yml (modes: local-temp-storage, local, storage-cli) |
+| `cc-reset-db` | Drop and recreate all databases |
+| `cc-setup-ide` | Copy IDE configs (VS Code, IntelliJ) - won't overwrite existing |
+| `cc-install-storage-cli` | Install storage-cli binary to tmp/bin/ (for S3 blobstore testing) |
+
+**Container management** (or use `docker compose` directly with profiles: `dev`, `full`, `s3`):
 ```bash
-uaac target http://localhost:8080
-uaac token client get admin -s "adminsecret"
+cc-containers start           # DBs + UAA + nginx (typical dev)
+cc-containers start minimal   # UAA + nginx only (for databases via brew)
+cc-containers start full      # All services
+cc-containers start s3        # Dev + SeaweedFS (S3 testing, local only)
+cc-containers stop            # Stop all
+cc-containers logs [service]  # Follow logs
+cc-containers status          # Show status
 ```
-- CF Admin:
+
+**Using brew databases instead of Docker:**
 ```bash
-cf api http://localhost
-cf login -u ccadmin -p secret
+brew services start postgresql@16
+brew services start mysql
+cc-containers start minimal   # Only starts UAA + nginx
 ```
 
-#### Starting the Cloud Controller locally
+**S3 blobstore testing (local only):**
 
-When the Docker containers have been set up as described above, you can start the cloud controller locally. Start the main process with:
-```
-DB_CONNECTION_STRING=mysql2://root:supersecret@127.0.0.1:3306/ccdb ./bin/cloud_controller -c ./tmp/cloud_controller.yml
-```
-Then start a local worker:
-```
-DB_CONNECTION_STRING=mysql2://root:supersecret@127.0.0.1:3306/ccdb CLOUD_CONTROLLER_NG_CONFIG=./tmp/cloud_controller.yml bundle exec rake jobs:local
+To test with S3-compatible storage via SeaweedFS:
+
+```bash
+cc-install-storage-cli                       # Downloads storage-cli to tmp/bin/
+export STORAGE_CLI_PATH="$(pwd)/tmp/bin/storage-cli"  # Point CC to storage-cli binary
+cc-containers start s3                       # Start dev profile + SeaweedFS
+cc-generate-config storage-cli               # Generate config with storage-cli blobstore
+eval "$(cc-db-env psql ccdb)"
+cloud_controller -c tmp/.dev-generated/cloud_controller.local.yml
 ```
-Start a delayed_job worker:
+
+**Note:** S3/storage-cli mode is only available for local development, not in devcontainer due to SeaweedFS mount issues.
+
+**Configuration:** Create `.envrc.local` (gitignored) for personal settings:
+```bash
+export PARALLEL_TEST_PROCESSORS=4  # Limit parallel test workers
 ```
-DB_CONNECTION_STRING=mysql2://root:supersecret@127.0.0.1:3306/ccdb CLOUD_CONTROLLER_NG_CONFIG=./tmp/cloud_controller.yml bundle exec rake jobs:generic
+
+#### Ports
+
+| Service | Port | Notes |
+|---------|------|-------|
+| Cloud Controller | 3000 | Direct access without nginx |
+| nginx | 80 | Proxies to CC, handles uploads |
+| UAA | 8080 | |
+| Postgres | 5432 | |
+| MySQL | 3306 | |
+
+#### Running Cloud Controller
+
+Cloud Controller requires `DB_CONNECTION_STRING` and a config file. The easiest way is using `cc-db-env`:
+
+```bash
+eval "$(cc-db-env psql ccdb)"        # Sets DB_CONNECTION_STRING and CLOUD_CONTROLLER_NG_CONFIG
+cloud_controller -c tmp/.dev-generated/cloud_controller.${CC_CONFIG}.yml
+
+# In another terminal, start a worker for async jobs (e.g., buildpack uploads):
+eval "$(cc-db-env psql ccdb)"
+bundle exec rake jobs:local
 ```
-And finally start the scheduler:
+
+Or set environment variables manually:
+```bash
+export DB_CONNECTION_STRING="postgres://postgres:supersecret@localhost:5432/ccdb"
+cloud_controller -c tmp/.dev-generated/cloud_controller.local.yml
 ```
-DB_CONNECTION_STRING=mysql2://root:supersecret@127.0.0.1:3306/ccdb CLOUD_CONTROLLER_NG_CONFIG=./tmp/cloud_controller.yml bundle exec rake clock:start
+
+`CC_CONFIG` is `local` by default, `devcontainer` in devcontainer/codespaces.
+
+#### CF CLI
+
+```bash
+# Devcontainer:
+cflogin                               # Alias: cf api http://nginx && cf auth ccadmin secret
+
+# Local (via nginx):
+cf api http://localhost && cf auth ccadmin secret
+
+# Local (direct, no nginx):
+cf api http://localhost:3000 && cf auth ccadmin secret
 ```
 
-Known limitations:
-- The [uaa_client_manager](https://github.com/cloudfoundry/cloud_controller_ng/blob/96c729fd116843ce06f40e7325a89f59b64d5f86/lib/services/sso/uaa/uaa_client_manager.rb#L29) requires SSL for UAA connections. The UAA instance in the Docker container provides however only plain http connections. You can set `http.use_ssl` to `false` as workaround.
+#### Credentials
+
+| Service | Connection |
+|---------|------------|
+| Postgres | `postgres://postgres:supersecret@localhost:5432` |
+| MySQL | `mysql2://root:supersecret@localhost:3306` |
+| CF Admin | `ccadmin` / `secret` |
+
+### Running Tests
 
-### Unit Tests
 **TLDR:** Always run `bundle exec rake` before committing
 
 To maintain a consistent and effective approach to testing, please refer to [the spec README](spec/README.md) and
 keep it up to date, documenting the purpose of the various types of tests.
 
-By default `rspec` will randomly pick between postgres and mysql.
+#### Database Configuration
 
-If postgres is not running on your OSX machine, you can start up a server by doing the following:
-```
-brew services start postgresql
-createuser -s postgres
-DB=postgres rake db:create
+The easiest way to configure the database for tests is using `cc-db-env`:
+
+```bash
+eval "$(cc-db-env psql test)"  # Configure for parallel tests with PostgreSQL
+eval "$(cc-db-env mysql test)" # Configure for parallel tests with MySQL
 ```
 
-It will try to connect to those databases with the following connection string:
+Alternatively, you can set environment variables manually. By default rspec will randomly pick between postgres and mysql. It will try to connect with the following connection strings:
 
 * postgres: `postgres://postgres@localhost:5432/cc_test`
 * mysql: `mysql2://root:password@localhost:3306/cc_test`
 
 To specify a custom username, password, host, or port for either database type, you can override the default
 connection string prefix (the part before the `cc_test` database name) by setting the `MYSQL_CONNECTION_PREFIX`
-and/or `POSTGRES_CONNECTION_PREFIX` variables. Alternatively, to override the full connection string, including 
-the database name, you can set the `DB_CONNECTION_STRING` environment variable.  This will restrict you to only 
+and/or `POSTGRES_CONNECTION_PREFIX` variables. Alternatively, to override the full connection string, including
+the database name, you can set the `DB_CONNECTION_STRING` environment variable. This will restrict you to only
 running tests in serial, however.
 
-For example, to run unit tests in parallel with a custom mysql username and password, you could execute:
+For example, to run unit tests in parallel with a custom mysql username and password:
 ```
 MYSQL_CONNECTION_PREFIX=mysql2://custom_user:custom_password@localhost:3306 bundle exec rake
 ```
 
-The following are examples of completely fully overriding the database connection string:
-
-    DB_CONNECTION_STRING="postgres://postgres@localhost:5432/cc_test" DB=postgres rake spec:serial
-    DB_CONNECTION_STRING="mysql2://root:password@localhost:3306/cc_test" DB=mysql rake spec:serial
-
-If you are running the integration specs (which are included in the full rake),
-and you are specifying `DB_CONNECTION_STRING`, you will also
-need to have a second test database with `_integration_cc` as the name suffix.
-
-For example, if you are using:
-
-    DB_CONNECTION_STRING="postgres://postgres@localhost:5432/cc_test"
-
-You will also need a database called:
-
-    `cc_test_integration_cc`
-
-The command
+Examples using `DB_CONNECTION_STRING` (serial only):
 ```
-rake db:create
+DB_CONNECTION_STRING="postgres://postgres@localhost:5432/cc_test" DB=postgres bundle exec rake spec:serial
+DB_CONNECTION_STRING="mysql2://root:password@localhost:3306/cc_test" DB=mysql bundle exec rake spec:serial
 ```
-will create the above database when the `DB` environment variable is set to postgres or mysql.
-You should run this before running rake in order to ensure that the `cc_test` database exists.
 
 #### Running tests on a single file
 
-The development team typically will run the specs to a single file as (e.g.)
-
     bundle exec rspec spec/unit/controllers/runtime/users_controller_spec.rb
 
 #### Running all the unit tests
@@ -198,9 +240,6 @@ you will need to run the tests in serial instead:
 
     bundle exec rake spec:serial
 
-To be able to run the unit tests in parallel and still use custom connection strings, use the
-`MYSQL_CONNECTION_PREFIX` and `POSTGRES_CONNECTION_PREFIX` environment variables described above.
-
 #### Running static analysis
 
     bundle exec rubocop
diff --git a/devenv.sh b/devenv.sh
deleted file mode 100755
index c9ea501bcb5..00000000000
--- a/devenv.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#/bin/bash
-set -eu
-trap "pkill -P $$" EXIT
-
-# Help text
-help_command() {
-  echo "Usage: $0 COMMAND"
-  echo ""
-  echo "Commands:"
-  echo "  create     - Setting up the development environment(containers)"
-  echo "  start      - Starting the development environment(containers), a existing fully set up set of containers must exist."
-  echo "  stop       - Stopping but not removing the development environment(containers)"
-  echo "  destroy    - Stopping and removing the development environment(containers)"
-  echo "  runconfigs - Copies matching run configurations for Intellij and VS Code into the respective folders"
-  echo "  help       - Print this help text"
-}
-
-
-# Create a clean development environment
-create_command(){
-  docker-compose -p "" down
-  docker buildx bake -f docker-compose.yml &
-  docker-compose -p "" pull &
-  wait $(jobs -p)
-  docker-compose -p "" up -d --build
-  ./.devcontainer/scripts/setupDevelopmentEnvironment.sh
-}
-
-# Start containers
-start_command(){
-  docker-compose -p "" start
-}
-
-# Stop containers
-stop_command(){
-  docker-compose -p "" stop
-}
-
-# Remove containers
-destroy_command(){
-  docker-compose -p "" down
-}
-
-# Call Setup IDEs Script
-runconfigs_command(){
-  ./.devcontainer/scripts/setupIDEs.sh
-  echo """
-  # In case you want the recommended extentions for VSCode(needed for debug, follow code symbols etc.), execute:
-  code --install-extension ms-azuretools.vscode-docker
-  code --install-extension oderwat.indent-rainbow
-  code --install-extension 2gua.rainbow-brackets
-  code --install-extension KoichiSasada.vscode-rdbg
-  code --install-extension Fooo.ruby-spec-runner
-  code --install-extension castwide.solargraph
-  code --install-extension eamodio.gitlens
-  code --install-extension github.vscode-github-actions
-  """
-}
-
-# Error handler
-handle_error() {
-  echo "Error: Invalid command"
-  help_command
-  exit 1
-}
-
-# Handle no command specified
-if [ $# -eq 0 ]; then
-  handle_error
-fi
-
-# Check Prerequisites
-export should_exit=0
-# Check Path Exists
-for p in docker docker-compose ruby bundle mysql psql yq; do
-    if ! command -v "${p}" >/dev/null 2>&1; then
-      echo "Error: Dependency \"$p\" is not installed" && export should_exit=1
-    fi
-done
-# Check execution as ruby might set a shim
-# shellcheck disable=SC2043
-for p in uaac; do
-    if ! eval "${p} --version" >/dev/null 2>&1; then
-      echo "Error: Dependency \"$p\" is not installed" && export should_exit=1
-    fi
-done
-if [ $should_exit != 0 ]; then
-  exit 1
-fi
-
-# Parse commands
-case "$1" in
-  create)
-    echo "Setting up the development environment(containers)"
-    create_command
-    ;;
-  start)
-    echo "Starting the development environment(containers), a existing fully set up set of containers must exist."
-    start_command
-    ;;
-  stop)
-    echo "Stopping but not removing the development environment(containers)"
-    stop_command
-    ;;
-  destroy)
-    echo "Stopping and removing the development environment(containers)"
-    destroy_command
-    ;;
-  runconfigs)
-    echo "Copying matching run configurations for intellij and vscode into the respective folders"
-    runconfigs_command
-    ;;
-  help)
-    help_command
-    ;;
-  *)
-    handle_error
-    ;;
-esac
-
-trap "" EXIT
diff --git a/docker-compose.yml b/docker-compose.yml
index faae094cb48..c85f89b9692 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,65 @@
 version: "3.3"
+
+# Profiles:
+#   (default)  - uaa, nginx only (for local DB via brew)
+#   dev        - + postgres, mysql (typical development)
+#   broker     - + catsbroker
+#   s3         - + seaweedfs (S3-compatible blobstore)
+#   diego      - + diego-api, mockserver, loggregator-metron
+#   full       - all services
+#
+# Usage:
+#   docker compose --profile dev up -d         # Typical dev (DBs + uaa + nginx)
+#   docker compose up -d                       # Local DBs via brew (just uaa + nginx)
+#   docker compose --profile full up -d        # All services
+
 services:
 
-  # Postgres
+  # === Default (always started) ===
+
+  uaa:
+    container_name: uaa
+    build:
+      context: .devcontainer/images/uaa
+      dockerfile: Dockerfile
+    ports:
+      - "127.0.0.1:8080:8080"
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:8080/info" ]
+      interval: 30s
+      timeout: 20s
+      retries: 3
+    networks:
+      - cc-net
+    restart: unless-stopped
+
+  nginx:
+    container_name: nginx
+    build:
+      context: .devcontainer/images/nginx
+      dockerfile: Dockerfile
+      args:
+        ENABLED_MODULES: nginx_upload_module
+    ports:
+      - "0.0.0.0:80:80"
+    networks:
+      - cc-net
+    volumes:
+      - .devcontainer/images/nginx/conf:/usr/local/nginx/conf:ro
+      - ./tmp:/tmp
+    cap_add:
+      - NET_BIND_SERVICE
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    restart: unless-stopped
+
+  # === DB Profile ===
+
   postgres:
     container_name: postgres
     image: postgres:16-alpine
     environment:
       POSTGRES_PASSWORD: supersecret
-    command: # logs every statement sent to the server. Slow, but helpful. Fills up disk Quickly !
-      - "postgres"
-      - "-c"
-      - "log_statement=all"
     ports:
       - "127.0.0.1:5432:5432"
     networks:
@@ -21,8 +70,10 @@ services:
       timeout: 5s
       retries: 5
     restart: unless-stopped
+    profiles:
+      - dev
+      - full
 
-  # MySQL
   mysql:
     container_name: mysql
     image: mysql:8.2
@@ -38,23 +89,57 @@ services:
     networks:
       - cc-net
     restart: unless-stopped
+    profiles:
+      - dev
+      - full
 
-  # UAA
-  uaa:
-    container_name: uaa
+  # === Broker Profile ===
+
+  catsbroker:
+    container_name: catsbroker
     build:
-      context: .devcontainer/images/uaa
+      context: .devcontainer/images/catsbroker
       dockerfile: Dockerfile
     ports:
-      - "127.0.0.1:8080:8080"
+      - "127.0.0.1:9292:9292"
+      - "127.0.0.1:9393:80"
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:8080/info" ]
+      test: [ "CMD", "curl", "-f", "http://localhost:9292/v2/catalog" ]
       interval: 30s
       timeout: 20s
       retries: 3
     networks:
       - cc-net
     restart: unless-stopped
+    profiles:
+      - broker
+      - full
+
+  # === S3 Profile ===
+
+  seaweedfs:
+    container_name: seaweedfs
+    image: chrislusf/seaweedfs:latest
+    command: 'server -s3 -dir=/data -s3.port=8333 -s3.allowEmptyFolder=true -s3.config=/etc/seaweedfs/s3.json'
+    ports:
+      - "127.0.0.1:8333:8333"
+      - "127.0.0.1:9333:9333"
+    volumes:
+      - seaweedfs-data:/data
+      - .devcontainer/images/seaweedfs:/etc/seaweedfs:ro
+    healthcheck:
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost:9333/cluster/status"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+    networks:
+      - cc-net
+    restart: unless-stopped
+    profiles:
+      - s3
+      - full
+
+  # === Diego Profile ===
 
   diego-api:
     container_name: diego-api
@@ -72,6 +157,9 @@ services:
     networks:
       - cc-net
     restart: unless-stopped
+    profiles:
+      - diego
+      - full
 
   mockserver:
     container_name: mockserver
@@ -90,8 +178,10 @@ services:
     networks:
       - cc-net
     restart: unless-stopped
+    profiles:
+      - diego
+      - full
 
-  # Loggregator Metron Mock
   loggregator-metron:
     container_name: loggregator-metron
     build:
@@ -108,76 +198,12 @@ services:
     networks:
       - cc-net
     restart: unless-stopped
-
-  # Minio S3 Blobstore
-  minio:
-    container_name: minio
-    image: minio/minio:latest
-    command: minio server --address ":9001" "/data"
-    ports:
-      - "127.0.0.1:9001:9001"
-      - "127.0.0.1:9000:9000"
-    environment:
-      MC_HOST_custom: http://localhost:9001
-    healthcheck:
-      test:
-        [
-          "CMD",
-          "mc",
-          "ready",
-          "custom"
-        ]
-      interval: 30s
-      timeout: 20s
-      retries: 3
-    networks:
-      - cc-net
-    restart: unless-stopped
-
-  # CATS Configurable Service Broker
-  catsbroker:
-    container_name: catsbroker
-    build:
-      context: .devcontainer/images/catsbroker
-      dockerfile: Dockerfile
-    ports:
-      - "127.0.0.1:9292:9292"
-      - "127.0.0.1:9393:80"
-    healthcheck:
-      test:
-        [
-          "CMD",
-          "curl",
-          "-f",
-          "http://localhost:9292/v2/catalog"
-        ]
-      interval: 30s
-      timeout: 20s
-      retries: 3
-    networks:
-      - cc-net
-    restart: unless-stopped
-
-  # Nginx Reverse Proxy (For uploads e.g. Packages)
-  nginx:
-    container_name: nginx
-    build:
-      context: .devcontainer/images/nginx
-      dockerfile: Dockerfile
-      args:
-        ENABLED_MODULES: nginx_upload_module
-    ports:
-      - "0.0.0.0:80:80"
-    networks:
-      - cc-net
-    volumes:
-      - .devcontainer/images/nginx/conf:/usr/local/nginx/conf:ro
-      - ./tmp:/tmp
-    cap_add:
-      - NET_BIND_SERVICE
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    restart: unless-stopped
+    profiles:
+      - diego
+      - full
 
 networks:
   cc-net:
+
+volumes:
+  seaweedfs-data: