diff --git a/Formula/neon-extension.rb b/Formula/neon-extension.rb
index 1523c98..f2a80e4 100644
--- a/Formula/neon-extension.rb
+++ b/Formula/neon-extension.rb
@@ -2,11 +2,16 @@ class NeonExtension < Formula
   desc "Extension enabling storage manager API and Pageserver communication"
   homepage "https://github.com/neondatabase/neon"
   url "https://github.com/neondatabase/neon.git",
-    tag:      "release-5090",
-    revision: "c6ed86d3d0690b52e7014b6a696effa95714e8cb"
+    tag:      "release-5733",
+    revision: "371020fe6acf3ed6b00f2687d06b3b2e7a6c73a0"
   license "Apache-2.0"
   head "https://github.com/neondatabase/neon.git", branch: "main"
 
+  livecheck do
+    url :head
+    regex(/^release-(\d+)$/i)
+  end
+
   bottle do
     root_url "https://ghcr.io/v2/bayandin/tap"
     sha256 cellar: :any,                 arm64_sonoma: "90120ab27ef7ead4c9460e4276663aea8b3b4284cc45c09c86f9e4cbdff23bdb"
diff --git a/Formula/neon-local.rb b/Formula/neon-local.rb
index 07affb5..65bd1a1 100644
--- a/Formula/neon-local.rb
+++ b/Formula/neon-local.rb
@@ -2,11 +2,16 @@ class NeonLocal < Formula
   desc "CLI for running Neon locally"
   homepage "https://github.com/neondatabase/neon"
   url "https://github.com/neondatabase/neon.git",
-    tag:      "release-5090",
-    revision: "c6ed86d3d0690b52e7014b6a696effa95714e8cb"
+    tag:      "release-5733",
+    revision: "371020fe6acf3ed6b00f2687d06b3b2e7a6c73a0"
   license "Apache-2.0"
   head "https://github.com/neondatabase/neon.git", branch: "main"
 
+  livecheck do
+    url :head
+    regex(/^release-(\d+)$/i)
+  end
+
   bottle do
     root_url "https://ghcr.io/v2/bayandin/tap"
     sha256 cellar: :any_skip_relocation, arm64_sonoma: "b9a11eda7b7f49a2dbd27e5bc3f699294b9be788d3d87233780c2eda4cf61932"
@@ -68,17 +73,20 @@ def post_install
     inreplace neon_repo_dir/"config" do |s|
       s.gsub! "http_port = 7676", "http_port = #{sk_http_port}"
       s.gsub! "pg_port = 5454", "pg_port = #{sk_pg_port}"
-      s.gsub! "listen_http_addr = \"127.0.0.1:9898\"", "listen_http_addr = \"127.0.0.1:#{ps_http_port}\""
-      s.gsub! "listen_pg_addr = \"127.0.0.1:64000\"", "listen_pg_addr = \"127.0.0.1:#{ps_pg_port}\""
       s.gsub! "listen_addr = \"127.0.0.1:50051\"", "listen_addr = \"127.0.0.1:#{broker_port}\""
     end
 
     inreplace neon_repo_dir/"pageserver_1/pageserver.toml" do |s|
-      s.gsub! "listen_http_addr ='127.0.0.1:9898'", "listen_http_addr = \"127.0.0.1:#{ps_http_port}\""
-      s.gsub! "listen_pg_addr ='127.0.0.1:64000'", "listen_pg_addr = \"127.0.0.1:#{ps_pg_port}\""
+      s.gsub! "listen_http_addr = \"127.0.0.1:9898\"", "listen_http_addr = \"127.0.0.1:#{ps_http_port}\""
+      s.gsub! "listen_pg_addr = \"127.0.0.1:64000\"", "listen_pg_addr = \"127.0.0.1:#{ps_pg_port}\""
       s.gsub! "broker_endpoint ='http://127.0.0.1:50051/'", "broker_endpoint = \"http://127.0.0.1:#{broker_port}/\""
     end
 
+    inreplace neon_repo_dir/"pageserver_1/metadata.json" do |s|
+      s.gsub! "\"port\":64000", "\"port\":#{ps_pg_port}"
+      s.gsub! "\"http_port\":9898", "\"http_port\":#{ps_http_port}"
+    end
+
     system bin/"neon_local", "start"
     pg_versions.each do |v|
       vv = v.delete_prefix("v")
diff --git a/Formula/neon-postgres.rb b/Formula/neon-postgres.rb
index b3067c8..9cc9a9d 100644
--- a/Formula/neon-postgres.rb
+++ b/Formula/neon-postgres.rb
@@ -2,11 +2,16 @@ class NeonPostgres < Formula
   desc "Neon's fork of PostgreSQL"
   homepage "https://github.com/neondatabase/postgres"
   url "https://github.com/neondatabase/neon.git",
-    tag:      "release-5090",
-    revision: "c6ed86d3d0690b52e7014b6a696effa95714e8cb"
+    tag:      "release-5733",
+    revision: "371020fe6acf3ed6b00f2687d06b3b2e7a6c73a0"
   license "Apache-2.0"
   head "https://github.com/neondatabase/neon.git", branch: "main"
 
+  livecheck do
+    url :head
+    regex(/^release-(\d+)$/i)
+  end
+
   bottle do
     root_url "https://ghcr.io/v2/bayandin/tap"
     sha256 arm64_sonoma: "ce4f452c19dda0e7dcab30f9dea9b89609063003a99f44ff0709f00bbfa55879"
diff --git a/Formula/neon-storage.rb b/Formula/neon-storage.rb
index 4bbee5a..a633648 100644
--- a/Formula/neon-storage.rb
+++ b/Formula/neon-storage.rb
@@ -2,11 +2,16 @@ class NeonStorage < Formula
   desc "Storage components for Neon"
   homepage "https://github.com/neondatabase/neon"
   url "https://github.com/neondatabase/neon.git",
-    tag:      "release-5090",
-    revision: "c6ed86d3d0690b52e7014b6a696effa95714e8cb"
+    tag:      "release-5733",
+    revision: "371020fe6acf3ed6b00f2687d06b3b2e7a6c73a0"
   license "Apache-2.0"
   head "https://github.com/neondatabase/neon.git", branch: "main"
 
+  livecheck do
+    url :head
+    regex(/^release-(\d+)$/i)
+  end
+
   bottle do
     root_url "https://ghcr.io/v2/bayandin/tap"
     sha256 cellar: :any,                 arm64_sonoma: "2db82e817fd9ede5676747907c4c82db1c28b9fc2d148b34899a35ccd3de3664"
@@ -31,8 +36,8 @@ class NeonStorage < Formula
   def binaries
     %w[
       compute_ctl neon_local pagebench pagectl pageserver
-      pg_sni_router proxy s3_scrubber safekeeper
-      storage_broker storage_controller trace wal_craft
+      safekeeper storage_broker storage_controller
+      storage_scrubber storcon_cli trace wal_craft
     ]
   end
 
@@ -47,20 +52,20 @@ def install
     ENV["POSTGRES_DISTRIB_DIR"] = neon_postgres.opt_libexec
 
     ENV["PQ_LIB_DIR"] = neon_postgres.pg_lib_for("v16") if OS.mac?
-    mkdir_p libexec/"control_plane/attachment_service"
-    cp_r "control_plane/attachment_service/migrations", libexec/"control_plane/attachment_service/"
+    mkdir_p libexec/"storage_controller"
+    cp_r "storage_controller/migrations", libexec/"storage_controller/"
 
     system "cargo", "install", *std_cargo_args(root: libexec, path: "compute_tools")
     system "cargo", "install", *std_cargo_args(root: libexec, path: "control_plane")
-    system "cargo", "install", *std_cargo_args(root: libexec, path: "control_plane/attachment_service")
+    system "cargo", "install", *std_cargo_args(root: libexec, path: "control_plane/storcon_cli")
     system "cargo", "install", *std_cargo_args(root: libexec, path: "libs/postgres_ffi/wal_craft")
     system "cargo", "install", *std_cargo_args(root: libexec, path: "pageserver")
     system "cargo", "install", *std_cargo_args(root: libexec, path: "pageserver/ctl")
     system "cargo", "install", *std_cargo_args(root: libexec, path: "pageserver/pagebench")
-    system "cargo", "install", *std_cargo_args(root: libexec, path: "proxy")
-    system "cargo", "install", *std_cargo_args(root: libexec, path: "s3_scrubber")
     system "cargo", "install", *std_cargo_args(root: libexec, path: "safekeeper")
     system "cargo", "install", *std_cargo_args(root: libexec, path: "storage_broker")
+    system "cargo", "install", *std_cargo_args(root: libexec, path: "storage_controller")
+    system "cargo", "install", *std_cargo_args(root: libexec, path: "storage_scrubber")
     system "cargo", "install", *std_cargo_args(root: libexec, path: "trace")
   end