diff --git a/nix/ext/plv8.nix b/nix/ext/plv8.nix
index 5cb4fb67e..107bd9107 100644
--- a/nix/ext/plv8.nix
+++ b/nix/ext/plv8.nix
@@ -103,16 +103,20 @@ stdenv.mkDerivation (finalAttrs: {
     # so changing them does not cause issues.
     mv "$out/nix/store"/*/* "$out"
     rmdir "$out/nix/store"/* "$out/nix/store" "$out/nix"
-
+    mv "$out/lib/plv8-${finalAttrs.version}.so" "$out/lib/plv8.so"
+    ln -s "$out/lib/plv8.so" "$out/lib/plv8-${finalAttrs.version}.so"
+    sed -i 's|module_pathname = '"'"'$libdir/plv8-[0-9.]*'"'"'|module_pathname = '"'"'$libdir/plv8'"'"'|' "$out/share/postgresql/extension/plv8.control"
+    sed -i 's|module_pathname = '"'"'$libdir/plv8-[0-9.]*'"'"'|module_pathname = '"'"'$libdir/plv8'"'"'|' "$out/share/postgresql/extension/plcoffee.control"
+    sed -i 's|module_pathname = '"'"'$libdir/plv8-[0-9.]*'"'"'|module_pathname = '"'"'$libdir/plv8'"'"'|' "$out/share/postgresql/extension/plls.control"
     ${lib.optionalString stdenv.isDarwin ''
-      install_name_tool -add_rpath "${v8}/lib" $out/lib/plv8-${finalAttrs.version}.so
-      install_name_tool -add_rpath "${postgresql}/lib" $out/lib/plv8-${finalAttrs.version}.so
-      install_name_tool -add_rpath "${stdenv.cc.cc.lib}/lib" $out/lib/plv8-${finalAttrs.version}.so
-      install_name_tool -change @rpath/libv8_monolith.dylib ${v8}/lib/libv8_monolith.dylib $out/lib/plv8-${finalAttrs.version}.so
+      install_name_tool -add_rpath "${v8}/lib" $out/lib/plv8.so
+      install_name_tool -add_rpath "${postgresql}/lib" $out/lib/plv8.so
+      install_name_tool -add_rpath "${stdenv.cc.cc.lib}/lib" $out/lib/plv8.so
+      install_name_tool -change @rpath/libv8_monolith.dylib ${v8}/lib/libv8_monolith.dylib $out/lib/plv8.so
     ''}
 
     ${lib.optionalString (!stdenv.isDarwin) ''
-      ${patchelf}/bin/patchelf --set-rpath "${v8}/lib:${postgresql}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/plv8-${finalAttrs.version}.so
+      ${patchelf}/bin/patchelf --set-rpath "${v8}/lib:${postgresql}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/plv8.so
     ''}
   '';
 
@@ -187,4 +191,4 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
     license = licenses.postgresql;
   };
-})
\ No newline at end of file
+})
diff --git a/nix/ext/wrappers/default.nix b/nix/ext/wrappers/default.nix
index 98d6a7cbc..54a2bddbc 100644
--- a/nix/ext/wrappers/default.nix
+++ b/nix/ext/wrappers/default.nix
@@ -63,24 +63,55 @@ buildPgrxExtension_0_11_3 rec {
     echo '${builtins.concatStringsSep "," previousVersions}' | sed 's/,/\n/g' > git_tags.txt
   '';
 
-  postInstall = ''
-    echo "Creating SQL files for previous versions..."
-    current_version="${version}"
-    sql_file="$out/share/postgresql/extension/wrappers--$current_version.sql"
-    
-    if [ -f "$sql_file" ]; then
-      while read -r previous_version; do
-        if [ "$(printf '%s\n' "$previous_version" "$current_version" | sort -V | head -n1)" = "$previous_version" ] && [ "$previous_version" != "$current_version" ]; then
-          new_file="$out/share/postgresql/extension/wrappers--$previous_version--$current_version.sql"
-          echo "Creating $new_file"
-          cp "$sql_file" "$new_file"
-        fi
-      done < git_tags.txt
-    else
-      echo "Warning: $sql_file not found"
-    fi
-    rm git_tags.txt
-  '';
+postInstall = ''
+  echo "Modifying main SQL file to use unversioned library name..."
+  current_version="${version}"
+  main_sql_file="$out/share/postgresql/extension/wrappers--$current_version.sql"
+  if [ -f "$main_sql_file" ]; then
+    sed -i 's|$libdir/wrappers-[0-9.]*|$libdir/wrappers|g' "$main_sql_file"
+    echo "Modified $main_sql_file"
+  else
+    echo "Warning: $main_sql_file not found"
+  fi
+
+  echo "Creating and modifying SQL files for previous versions..."
+  
+  if [ -f "$main_sql_file" ]; then
+    while read -r previous_version; do
+      if [ "$(printf '%s\n' "$previous_version" "$current_version" | sort -V | head -n1)" = "$previous_version" ] && [ "$previous_version" != "$current_version" ]; then
+        new_file="$out/share/postgresql/extension/wrappers--$previous_version--$current_version.sql"
+        echo "Creating $new_file"
+        cp "$main_sql_file" "$new_file"
+        sed -i 's|$libdir/wrappers-[0-9.]*|$libdir/wrappers|g' "$new_file"
+        echo "Modified $new_file"
+      fi
+    done < git_tags.txt
+  else
+    echo "Warning: $main_sql_file not found"
+  fi
+
+  mv $out/lib/wrappers-${version}.so $out/lib/wrappers.so
+
+  echo "Creating wrappers.so symlinks to support pg_upgrade..."
+  if [ -f "$out/lib/wrappers.so" ]; then
+    while read -r previous_version; do
+      if [ "$(printf '%s\n' "$previous_version" "$current_version" | sort -V | head -n1)" = "$previous_version" ] && [ "$previous_version" != "$current_version" ]; then
+        new_file="$out/lib/wrappers-$previous_version.so"
+        echo "Creating $new_file"
+        ln -s "$out/lib/wrappers.so" "$new_file"
+      fi
+    done < git_tags.txt
+  else
+    echo "Warning: $out/lib/wrappers.so not found"
+  fi
+  rm git_tags.txt
+
+  echo "Contents of updated wrappers.control:"
+  cat "$out/share/postgresql/extension/wrappers.control"
+
+  echo "List of generated SQL files:"
+  ls -l $out/share/postgresql/extension/wrappers--*.sql
+'';
 
   meta = with lib; {
     description = "Various Foreign Data Wrappers (FDWs) for PostreSQL";