diff --git a/Gemfile.lock b/Gemfile.lock
index 668dcd3..629968f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,7 +172,7 @@ GEM
     mocha (2.7.1)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.8.0)
-    ndr_dev_support (7.3.3)
+    ndr_dev_support (7.3.4)
       activesupport (>= 6.1, < 8.1)
       brakeman (>= 4.7.1)
       bundler-audit
diff --git a/config/deploy.rb b/config/deploy.rb
index 8f7431f..52739fc 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,3 +1,6 @@
+# Avoid spurious deprecation warning on STDERR with capistrano 2 and bundler 2.x
+set :bundle_cmd, 'BUNDLE_SILENCE_DEPRECATIONS=true bundle'
+
 require 'bundler/capistrano'
 require 'ndr_dev_support/capistrano/ndr_model'
 
@@ -51,8 +54,20 @@
   task :configure do
     # We need to use local configuration, because global configuration will be "global" for the
     # deploying user, rather than the application user.
+    # You can override the path using e.g. set :pg_conf_path, '/usr/pgsql-9.5/bin/pg_config'
+    # otherwise the latest installed version will be used.
+    # Note that the relevant postgresql-devel package is required, not just postgresql
     run <<~SHELL
-      cd #{release_path} && bundle config --local build.pg --with-pg-config=/usr/pgsql-11/bin/pg_config
+      set -e;
+      cd #{release_path};
+      pg_conf_path="#{fetch(:pg_conf_path, '')}";
+      if [ -z "$pg_conf_path" ]; then
+        pg_conf_path=`ls -1d /usr/pgsql-{9*,[1-8]*}/include 2> /dev/null | sed -e 's:/include$:/bin/pg_config:' | tail -1`;
+      fi;
+      if [ -n "$pg_conf_path" ]; then
+        echo Using pg_conf_path=\\"$pg_conf_path\\";
+        bundle config --local build.pg --with-pg-config="$pg_conf_path";
+      fi
     SHELL
   end
 end
diff --git a/vendor/cache/ndr_dev_support-7.3.3.gem b/vendor/cache/ndr_dev_support-7.3.3.gem
deleted file mode 100644
index 1601aae..0000000
Binary files a/vendor/cache/ndr_dev_support-7.3.3.gem and /dev/null differ
diff --git a/vendor/cache/ndr_dev_support-7.3.4.gem b/vendor/cache/ndr_dev_support-7.3.4.gem
new file mode 100644
index 0000000..6fa2ff7
Binary files /dev/null and b/vendor/cache/ndr_dev_support-7.3.4.gem differ