diff --git a/settings.sh.in b/settings.sh.in
index a7b539c5..932e25a5 100755
--- a/settings.sh.in
+++ b/settings.sh.in
@@ -37,10 +37,10 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/local/bin
 
 PG_SSH_OSX=buildfarm@macbuildfarm-prod-cyt-3.edbcorp.net
 PG_PATH_OSX=/opt/pginstaller_16.auto
-PG_SSH_OSX_SIGN=buildfarm@cadwell.ox.uk.enterprisedb.com
+PG_SSH_OSX_SIGN=buildfarm@macbuildfarm-prod-cyt-1.edbcorp.net
 PG_PATH_OSX_SIGN=/Users/buildfarm/pginstaller_16.auto
 PG_PATH_OSX_SIGNTOOL=/opt/local/bin/osxsigner
-PG_SSH_OSX_NOTARY=buildfarm@cadwell.ox.uk.enterprisedb.com
+PG_SSH_OSX_NOTARY=buildfarm@macbuildfarm-prod-cyt-1.edbcorp.net
 PG_PATH_OSX_NOTARY=/Users/buildfarm/pginstaller_16.notary
 PG_PGHOME_OSX=$PG_PATH_OSX/server/staging_cache/osx
 PG_MAVEN_HOME_OSX=/opt/local/Current/apache-maven-3.8.2