diff --git a/internal/component/storage.go b/internal/component/storage.go
index 91f77c3..fc689ee 100644
--- a/internal/component/storage.go
+++ b/internal/component/storage.go
@@ -198,7 +198,7 @@ func (b *StorageBuilder) BuildDeployment(project *v1alpha1.SupabaseProject) (*ap
 			},
 		},
 		{
-			Name: "S3_ENDPOINT",
+			Name: "GLOBAL_S3_ENDPOINT",
 			ValueFrom: &corev1.EnvVarSource{
 				SecretKeyRef: &corev1.SecretKeySelector{
 					LocalObjectReference: corev1.LocalObjectReference{
@@ -208,6 +208,22 @@ func (b *StorageBuilder) BuildDeployment(project *v1alpha1.SupabaseProject) (*ap
 				},
 			},
 		},
+		{
+			Name:  "GLOBAL_S3_FORCE_PATH_STYLE",
+			Value: "true",
+		},
+		{
+			Name:  "TENANT_ID",
+			Value: "stub",
+		},
+		{
+			Name:  "REGION",
+			Value: "stub",
+		},
+		{
+			Name:  "POSTGREST_URL",
+			Value: "http://" + project.Name + "-postgrest:3000",
+		},
 	}
 
 	deployment := &appsv1.Deployment{
@@ -289,12 +305,12 @@ func (b *StorageBuilder) BuildService(project *v1alpha1.SupabaseProject) (*corev
 func getStorageDefaultResources() corev1.ResourceRequirements {
 	return corev1.ResourceRequirements{
 		Requests: corev1.ResourceList{
-			corev1.ResourceMemory: resource.MustParse("64Mi"),
-			corev1.ResourceCPU:    resource.MustParse("50m"),
+			corev1.ResourceMemory: resource.MustParse("256Mi"),
+			corev1.ResourceCPU:    resource.MustParse("100m"),
 		},
 		Limits: corev1.ResourceList{
-			corev1.ResourceMemory: resource.MustParse("128Mi"),
-			corev1.ResourceCPU:    resource.MustParse("100m"),
+			corev1.ResourceMemory: resource.MustParse("512Mi"),
+			corev1.ResourceCPU:    resource.MustParse("500m"),
 		},
 	}
 }
diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go
index 22d4ed6..6bff16a 100644
--- a/internal/controller/suite_test.go
+++ b/internal/controller/suite_test.go
@@ -50,7 +50,7 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "config", "crd", "bases")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "helm", "supabase-operator", "crds")},
 		ErrorIfCRDPathMissing: true,
 	}
 
diff --git a/internal/webhook/wellknown_supabase_images.go b/internal/webhook/wellknown_supabase_images.go
index 0adc3ff..1cd0f5d 100644
--- a/internal/webhook/wellknown_supabase_images.go
+++ b/internal/webhook/wellknown_supabase_images.go
@@ -7,7 +7,7 @@ const (
 	DefaultAuthImage       = "supabase/gotrue:v2.180.0"
 	DefaultPostgRESTImage  = "postgrest/postgrest:v13.0.7"
 	DefaultRealtimeImage   = "supabase/realtime:v2.51.11"
-	DefaultStorageAPIImage = "supabase/storage-api:v1.28.0"
+	DefaultStorageAPIImage = "supabase/storage-api:v1.32.0"
 	DefaultMetaImage       = "supabase/postgres-meta:v0.93.1"
 	DefaultStudioImage     = "supabase/studio:2025.10.01-sha-8460121"
 	DefaultPostgresImage   = "postgres:15-alpine"
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index ee819f0..475a7fd 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -694,7 +694,6 @@ func captureStudioScreenshot(ctx context.Context, chromePath, url, username, pas
 		chromedp.Flag("disable-gpu", true),
 		chromedp.Flag("no-sandbox", true),
 		chromedp.Flag("disable-dev-shm-usage", true),
-		chromedp.Flag("single-process", true),
 		chromedp.Flag("hide-scrollbars", true),
 		chromedp.Flag("window-size", "1280,720"),
 		chromedp.Flag("remote-allow-origins", "*"),
@@ -708,7 +707,7 @@ func captureStudioScreenshot(ctx context.Context, chromePath, url, username, pas
 	const maxAttempts = 3
 	for attempt := 1; attempt <= maxAttempts; attempt++ {
 		attemptAllocatorCtx, cancelAlloc := chromedp.NewExecAllocator(ctx, allocOpts...)
-		attemptCtx, cancelTimeout := context.WithTimeout(attemptAllocatorCtx, 5*time.Minute)
+		attemptCtx, cancelTimeout := context.WithTimeout(attemptAllocatorCtx, 1*time.Minute)
 
 		browserCtx, cancelCtx := chromedp.NewContext(
 			attemptCtx,