diff --git a/build.sh b/build.sh
index 3e3f6e4..e0c83e9 100755
--- a/build.sh
+++ b/build.sh
@@ -187,9 +187,9 @@ make defconfig
 cat >> .config <<EOF
 CONFIG_VERSION_DIST="MFW"
 CONFIG_VERSION_MANUFACTURER="Untangle"
-CONFIG_VERSION_BUG_URL="https://jira.untangle.com/projects/MFW/"
+CONFIG_VERSION_BUG_URL="https://jira.edge.arista.com/projects/MFW/"
 CONFIG_VERSION_HOME_URL="https://github.com/untangle/mfw_feeds"
-CONFIG_VERSION_SUPPORT_URL="https://support.untangle.com/hc/en-us/articles/360008238393"
+CONFIG_VERSION_SUPPORT_URL="https://support.edge.arista.com/hc/en-us/articles/360008238393"
 CONFIG_VERSION_PRODUCT="MFW"
 EOF
 
@@ -209,7 +209,7 @@ if [ -n "$BUILD_URL" ] ; then # Jenkins build
     x86_64) DEVICE=x86-64 ;;
   esac
   packagesList="mfw-${DEVICE}-Packages_${mfwVersion}_${SOURCE_DATE}.txt"
-  echo CONFIG_VERSION_MANUFACTURER_URL="https://downloads.untangle.com/public/mfw/${mfwShortVersion}/manifest/${packagesList}" >> .config
+  echo CONFIG_VERSION_MANUFACTURER_URL="https://downloads.edge.arista.com/public/mfw/${mfwShortVersion}/manifest/${packagesList}" >> .config
 else
   echo CONFIG_VERSION_MANUFACTURER_URL="developer build" >> .config
 fi
diff --git a/version-images.sh b/version-images.sh
index 14416ef..c79b235 100755
--- a/version-images.sh
+++ b/version-images.sh
@@ -81,7 +81,7 @@ cp bin/packages/*/mfw/Packages ${OUTPUT_DIR}/${PACKAGES_FILE}
 # also push that list to s3 (Jenkins should have the necessary AWS_*
 # environment variables)
 if [[ -n "$UPLOAD_TO_S3" ]] ; then
-  s3path="s3://downloads.untangle.com-temp/mfw/${SHORT_VERSION}/manifest/${PACKAGES_FILE}"
+  s3path="s3://downloads.edge.arista.com-temp/mfw/${SHORT_VERSION}/manifest/${PACKAGES_FILE}"
   rc=1
   for i in $(seq 1 5) ; do
     if s3cmd put bin/packages/*/mfw/Packages $s3path ; then