diff --git a/databases/puppetdb-terminus7/Makefile b/databases/puppetdb-terminus7/Makefile
index 377ca7690d1e..82687b8cbf8b 100644
--- a/databases/puppetdb-terminus7/Makefile
+++ b/databases/puppetdb-terminus7/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	7.19.1
+PORTVERSION=	7.20.1
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	7
 DISTNAME=	puppetdb-${PORTVERSION}
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend terminus module
 WWW=		https://docs.puppetlabs.com/puppetdb/latest/
 
 LICENSE=	APACHE20
 
 CONFLICTS_INSTALL=	puppetdb-terminus[0-9]
 NO_BUILD=	yes
 USES=		gmake ruby
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-puppetdb-termini
 
 .include <bsd.port.mk>
diff --git a/databases/puppetdb-terminus7/distinfo b/databases/puppetdb-terminus7/distinfo
index c9bf6a00143d..d79860fbaca8 100644
--- a/databases/puppetdb-terminus7/distinfo
+++ b/databases/puppetdb-terminus7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722084139
-SHA256 (puppetdb-7.19.1.tar.gz) = 2a4437279a2693d42e315f0d02d90d57d9ec3ba7ddf789387132504390c127ed
-SIZE (puppetdb-7.19.1.tar.gz) = 52342245
+TIMESTAMP = 1730781513
+SHA256 (puppetdb-7.20.1.tar.gz) = 763bec6bb2310ee077c9c1e5e7ee190e2ced085ce8d1eddbbe1e5f470487ddfa
+SIZE (puppetdb-7.20.1.tar.gz) = 52353416
diff --git a/databases/puppetdb-terminus7/files/patch-Makefile b/databases/puppetdb-terminus7/files/patch-Makefile
index 5a65712aa286..40ec63e2cdf3 100644
--- a/databases/puppetdb-terminus7/files/patch-Makefile
+++ b/databases/puppetdb-terminus7/files/patch-Makefile
@@ -1,61 +1,61 @@
---- Makefile.orig	2024-07-19 17:09:14 UTC
+--- Makefile.orig	2024-10-29 18:03:30 UTC
 +++ Makefile
 @@ -1,7 +1,7 @@ confdir = /etc
  prefix = /usr/local
  datadir = $(prefix)/share
  confdir = /etc
 -rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
 +rubylibdir = $(shell /usr/local/bin/ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
  rundir = /var/run
  bindir = /usr/bin
  
 @@ -36,22 +36,33 @@ install-puppetdb-termini:
  
  
  install-puppetdb-termini:
--	install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
+-	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
 -	install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
--	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
+-	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
 -	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
+-	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
 -	install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
--	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
--	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
--	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
+-	install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
 -	install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
 -	install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
+-	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
 -	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
 -	install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
 -	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
+-	install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
-+	install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
++	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
 +	install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
-+	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
++	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
 +	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
++	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
 +	install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
-+	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
-+	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
-+	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
++	install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
 +	install -m 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
 +	install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
++	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
 +	install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
-+	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
-+	install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
 +	install -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
-+	install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
 +	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
++	install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
++	install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
++	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
  
  install-rpm-sysv-init: install-rpm-preinst
  	install -d -m 0755 "$(DESTDIR)$(initdir)"
diff --git a/databases/puppetdb7/Makefile b/databases/puppetdb7/Makefile
index 3102011cf8cc..974d3794018f 100644
--- a/databases/puppetdb7/Makefile
+++ b/databases/puppetdb7/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	puppetdb
-PORTVERSION=	7.19.1
+PORTVERSION=	7.20.1
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	7
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend
 WWW=		https://docs.puppetlabs.com/puppetdb/latest/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash:shells/bash
 
 USE_RC_SUBR=	puppetdb
 
 CONFLICTS_INSTALL=	puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample
 USES=		cpe shebangfix
 CPE_VENDOR=	puppet
 SHEBANG_FILES=	ext/bin/puppetdb \
 		ext/cli/anonymize \
 		ext/cli/config-migration \
 		ext/cli/foreground \
 		ext/cli/ssl-setup \
 		ext/cli/start \
 		ext/cli/stop \
 		ext/cli/reload \
 		ext/cli/upgrade \
 		ext/ezbake-functions.sh
 USE_JAVA=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USERS=		puppetdb
 GROUPS=		puppetdb
 
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 SUB_FILES=	pkg-message
 
 post-patch:
 .for file in Makefile ext/bin/puppetdb ext/cli/ssl-setup \
 	ext/config/conf.d/jetty.ini ext/config/conf.d/config.ini
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb
 	@${REINPLACE_CMD} -e 's|/puppetlabs/puppetdb/|/puppetdb/|' \
 		-e 's|\(install -m 0644 ext/config/.*\)"|\1.sample"|' \
 		${WRKSRC}/Makefile
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb
 
 .include <bsd.port.mk>
diff --git a/databases/puppetdb7/distinfo b/databases/puppetdb7/distinfo
index d2054dae1e8e..7fd285f54bf8 100644
--- a/databases/puppetdb7/distinfo
+++ b/databases/puppetdb7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1721971840
-SHA256 (puppetdb-7.19.1.tar.gz) = 2a4437279a2693d42e315f0d02d90d57d9ec3ba7ddf789387132504390c127ed
-SIZE (puppetdb-7.19.1.tar.gz) = 52342245
+TIMESTAMP = 1730781468
+SHA256 (puppetdb-7.20.1.tar.gz) = 763bec6bb2310ee077c9c1e5e7ee190e2ced085ce8d1eddbbe1e5f470487ddfa
+SIZE (puppetdb-7.20.1.tar.gz) = 52353416