diff --git a/Dockerfile-15 b/Dockerfile-15
index 42ffc858c..5ef571c51 100644
--- a/Dockerfile-15
+++ b/Dockerfile-15
@@ -30,7 +30,7 @@ ARG pg_repack_release=1.4.8
 ARG vault_release=0.2.8
 ARG groonga_release=12.0.8
 ARG pgroonga_release=2.4.0
-ARG wrappers_release=0.4.6
+ARG wrappers_release=0.5.0
 ARG hypopg_release=1.3.1
 ARG pgvector_release=0.4.0
 ARG pg_tle_release=1.3.2
diff --git a/Dockerfile-17 b/Dockerfile-17
index 8bfdf39af..fe8f96c2d 100644
--- a/Dockerfile-17
+++ b/Dockerfile-17
@@ -31,7 +31,7 @@ ARG pg_repack_release=1.4.8
 ARG vault_release=0.2.8
 ARG groonga_release=12.0.8
 ARG pgroonga_release=2.4.0
-ARG wrappers_release=0.4.6
+ARG wrappers_release=0.5.0
 ARG hypopg_release=1.3.1
 ARG pgvector_release=0.4.0
 ARG pg_tle_release=1.3.2
diff --git a/Dockerfile-orioledb-17 b/Dockerfile-orioledb-17
index f7c0d4f63..7c981177b 100644
--- a/Dockerfile-orioledb-17
+++ b/Dockerfile-orioledb-17
@@ -31,7 +31,7 @@ ARG pg_repack_release=1.4.8
 ARG vault_release=0.2.8
 ARG groonga_release=12.0.8
 ARG pgroonga_release=2.4.0
-ARG wrappers_release=0.4.6
+ARG wrappers_release=0.5.0
 ARG hypopg_release=1.3.1
 ARG pgvector_release=0.4.0
 ARG pg_tle_release=1.3.2
diff --git a/ansible/vars.yml b/ansible/vars.yml
index 0e658202d..4821ee48b 100644
--- a/ansible/vars.yml
+++ b/ansible/vars.yml
@@ -9,9 +9,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.0.1.078-orioledb"
-  postgres17: "17.4.1.028"
-  postgres15: "15.8.1.085"
+  postgresorioledb-17: "17.0.1.079-orioledb"
+  postgres17: "17.4.1.029"
+  postgres15: "15.8.1.086"
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"
diff --git a/flake.lock b/flake.lock
index 2d05388c6..d593fa3dc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -123,11 +123,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1728538411,
-        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
         "type": "github"
       },
       "original": {
@@ -151,11 +151,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1729045942,
-        "narHash": "sha256-HjmK0x5Zm2TK2vFpC7XBM2e3EDNVnAIuEoU2FkeN8xw=",
+        "lastModified": 1746758179,
+        "narHash": "sha256-JECUw1YBEsTsVauvupRzE5ykZaJoyhHCpoY87ZZJGas=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "9de3cea452d2401d6f93c06ad985178a4e11d1fc",
+        "rev": "4fd00513eac6b6140c5dced3e1b8133e2369a0f8",
         "type": "github"
       },
       "original": {
diff --git a/nix/ext/pg_graphql.nix b/nix/ext/pg_graphql.nix
index af2f02447..ef406f8d4 100644
--- a/nix/ext/pg_graphql.nix
+++ b/nix/ext/pg_graphql.nix
@@ -27,7 +27,9 @@ buildPgrxExtension_0_12_9 rec {
   # Setting RUSTFLAGS in env to ensure it's available for all phases
   env = lib.optionalAttrs stdenv.isDarwin {
     POSTGRES_LIB = "${postgresql}/lib";
-    PGPORT = if (lib.versions.major postgresql.version) == "17" then "5440" else "5439";
+    PGPORT = toString (5430 + 
+      (if builtins.match ".*_.*" postgresql.version != null then 1 else 0) +  # +1 for OrioleDB
+      ((builtins.fromJSON (builtins.substring 0 2 postgresql.version)) - 15) * 2);  # +2 for each major version
     RUSTFLAGS = "-C link-arg=-undefined -C link-arg=dynamic_lookup";
     NIX_BUILD_CORES = "4";  # Limit parallel jobs
     CARGO_BUILD_JOBS = "4"; # Limit cargo parallelism
diff --git a/nix/ext/wrappers/default.nix b/nix/ext/wrappers/default.nix
index e87dfb372..2bd424942 100644
--- a/nix/ext/wrappers/default.nix
+++ b/nix/ext/wrappers/default.nix
@@ -12,21 +12,21 @@
 , git
 }:
 let
-  rustVersion = "1.81.0";
+  rustVersion = "1.84.0";
   cargo = rust-bin.stable.${rustVersion}.default;
 in
 buildPgrxExtension_0_12_9 rec {
   pname = "supabase-wrappers";
-  version = "0.4.6";
+  version = "0.5.0";
   # update the following array when the wrappers version is updated
   # required to ensure that extensions update scripts from previous versions are generated
-  previousVersions = ["0.4.5" "0.4.4" "0.4.3" "0.4.2" "0.4.1" "0.4.0" "0.3.1" "0.3.0" "0.2.0" "0.1.19" "0.1.18" "0.1.17" "0.1.16" "0.1.15" "0.1.14" "0.1.12" "0.1.11" "0.1.10" "0.1.9" "0.1.8" "0.1.7" "0.1.6" "0.1.5" "0.1.4" "0.1.1" "0.1.0"];
+  previousVersions = ["0.4.6" "0.4.5" "0.4.4" "0.4.3" "0.4.2" "0.4.1" "0.4.0" "0.3.1" "0.3.0" "0.2.0" "0.1.19" "0.1.18" "0.1.17" "0.1.16" "0.1.15" "0.1.14" "0.1.12" "0.1.11" "0.1.10" "0.1.9" "0.1.8" "0.1.7" "0.1.6" "0.1.5" "0.1.4" "0.1.1" "0.1.0"];
   inherit postgresql;
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "wrappers";
     rev = "v${version}";
-    hash = "sha256-hthb3qEXT1Kf4yPoq0udEbQzlyLtI5tug6sK4YAPFjU=";
+    hash = "sha256-FbRTUcpEHBa5DI6dutvBeahYM0RZVAXIzIAZWIaxvn0";
   };
  
   nativeBuildInputs = [ pkg-config cargo git ];
@@ -50,7 +50,7 @@ buildPgrxExtension_0_12_9 rec {
     # - PostgreSQL 15.8 → 5435 + 0 + (15-15)*2 = 5435
     # - PostgreSQL 17_0 (OrioleDB) → 5435 + 1 + (17-15)*2 = 5440
     # - PostgreSQL 17.4 → 5435 + 0 + (17-15)*2 = 5439
-    PGPORT = toString (5435 + 
+    PGPORT = toString (5534 + 
       (if builtins.match ".*_.*" postgresql.version != null then 1 else 0) +  # +1 for OrioleDB
       ((builtins.fromJSON (builtins.substring 0 2 postgresql.version)) - 15) * 2);  # +2 for each major version
   };