diff --git a/Make.bat b/Make.bat
index 8302a7d37..291334783 100644
--- a/Make.bat
+++ b/Make.bat
@@ -358,7 +358,7 @@ REM Main build sequence Ends
 
 :GENERATE_SBOM
     ECHO Generating SBOM...
-    syft "%DISTROOT%\" -o cyclonedx-json > "%DISTROOT%\cyclonedx.json"
+    syft "%BUILDROOT%\" -o cyclonedx-json > "%BUILDROOT%\sbom.json"
 
 :SIGN_INSTALLER
     ECHO Attempting to sign the installer...
diff --git a/pkg/debian/build.sh b/pkg/debian/build.sh
index 98c3155c8..cf919b545 100755
--- a/pkg/debian/build.sh
+++ b/pkg/debian/build.sh
@@ -78,7 +78,7 @@ Maintainer: pgAdmin Development Team <pgadmin-hackers@postgresql.org>
 Description: The desktop user interface for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
 EOF
 
-# Build the Debian package for the server
+# Build the Debian package for the desktop
 fakeroot dpkg-deb --build "${DESKTOPROOT}" "${DISTROOT}/${APP_NAME}-desktop_${APP_LONG_VERSION}_${OS_ARCH}.deb"
 
 #
diff --git a/pkg/mac/build-functions.sh b/pkg/mac/build-functions.sh
index e1e66650d..c1406e653 100644
--- a/pkg/mac/build-functions.sh
+++ b/pkg/mac/build-functions.sh
@@ -323,7 +323,7 @@ _complete_bundle() {
 
 _generate_sbom() {
    echo "Generating SBOM..."
-   syft "${BUNDLE_DIR}/Contents/" -o cyclonedx-json > "${BUNDLE_DIR}/Contents/cyclonedx.json"
+   syft "${BUNDLE_DIR}/Contents/" -o cyclonedx-json > "${BUNDLE_DIR}/Contents/sbom.json"
 }
 
 _codesign_binaries() {