diff --git a/ansible/tasks/setup-wal-g.yml b/ansible/tasks/setup-wal-g.yml
index 5ba268cf9..a05106ede 100644
--- a/ansible/tasks/setup-wal-g.yml
+++ b/ansible/tasks/setup-wal-g.yml
@@ -44,7 +44,7 @@
 
 - name: Create symlink to make wal-g-v2 the default wal-g
   ansible.builtin.file:
-    src: /usr/local/bin/wal-g-v2
+    src: /home/wal-g/.nix-profile/bin/wal-g-2
     dest: /usr/local/bin/wal-g
     state: link
     force: yes
diff --git a/ansible/vars.yml b/ansible/vars.yml
index da19e42ef..5652df014 100644
--- a/ansible/vars.yml
+++ b/ansible/vars.yml
@@ -8,8 +8,8 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.0.1.052-orioledb"
-  postgres15: "15.8.1.059"
+  postgresorioledb-17: "17.0.1.053-orioledb"
+  postgres15: "15.8.1.060"
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"
diff --git a/nix/ext/pg_graphql.nix b/nix/ext/pg_graphql.nix
index 54e500924..4ee04bac8 100644
--- a/nix/ext/pg_graphql.nix
+++ b/nix/ext/pg_graphql.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchFromGitHub, postgresql, buildPgrxExtension_0_12_9, cargo, rust-bin }:
 
 let
-    rustVersion = "nightly";
-    cargo = rust-bin.nightly.latest.default;
+    rustVersion = "1.81.0";
+    cargo = rust-bin.stable.${rustVersion}.default;
 in
 buildPgrxExtension_0_12_9 rec {
   pname = "pg_graphql";
@@ -27,12 +27,11 @@ 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 = "5434";
+    PGPORT = if (lib.versions.major postgresql.version) == "17" then "5440" else "5439";
     RUSTFLAGS = "-C link-arg=-undefined -C link-arg=dynamic_lookup";
     NIX_BUILD_CORES = "4";  # Limit parallel jobs
     CARGO_BUILD_JOBS = "4"; # Limit cargo parallelism
   };
-CARGO_BUILD_RUSTFLAGS = "--cfg tokio_unstable -C debuginfo=0";
   CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG = true;
 
   
@@ -45,4 +44,4 @@ CARGO_BUILD_RUSTFLAGS = "--cfg tokio_unstable -C debuginfo=0";
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
-}
\ No newline at end of file
+}