diff --git a/pkg/mac/build.sh b/pkg/mac/build.sh
index c8b443b70..fad77a06e 100755
--- a/pkg/mac/build.sh
+++ b/pkg/mac/build.sh
@@ -152,6 +152,10 @@ _build_runtime() {
     make clean
     ${QMAKE} || { echo qmake failed; exit 1; }
     make || { echo make failed; exit 1; }
+    # Hack to pass notarization due to name change between app and binary
+    if [ -f pgAdmin4.app/Contents/MacOS/pgAdmin4 ]; then
+        mv pgAdmin4.app/Contents/MacOS/pgAdmin4 "pgAdmin4.app/Contents/MacOS/${APP_NAME}"
+    fi
     cp -r pgAdmin4.app "${BUILDROOT}/${APP_BUNDLE_NAME}"
 }
 
diff --git a/pkg/mac/codesign-binaries.sh b/pkg/mac/codesign-binaries.sh
index 4bd00b4a6..3008f31c3 100755
--- a/pkg/mac/codesign-binaries.sh
+++ b/pkg/mac/codesign-binaries.sh
@@ -25,13 +25,13 @@ for i in $(find "${BUNDLE}" -type f)
 do
 	file "${i}" | grep -E "Mach-O executable|Mach-O 64-bit executable|Mach-O 64-bit bundle"
 	if [ $? -eq 0 ] ; then
-		codesign --deep -f -i "${DEVELOPER_BUNDLE_ID}" -s "${DEVELOPER_ID}" --options runtime ${i}
+		codesign --deep --verify --verbose --timestamp --options runtime -i "${DEVELOPER_BUNDLE_ID" --sign "${DEVELOPER_ID}" "$"
 	fi
 done
 
 echo Signing ${BUNDLE} libraries
 for i in $(find "${BUNDLE}" -type f -name "*.dylib*")
 do
-	codesign --deep -f -i "${DEVELOPER_BUNDLE_ID}" -s "${DEVELOPER_ID}" --options runtime ${i}
+	codesign --deep --verify --verbose --timestamp --options runtime -i "${DEVELOPER_BUNDLE_ID" --sign "${DEVELOPER_ID}" "$"
 done
 
diff --git a/pkg/mac/codesign-bundle.sh b/pkg/mac/codesign-bundle.sh
index 7a1c6f78b..dfc128d34 100755
--- a/pkg/mac/codesign-bundle.sh
+++ b/pkg/mac/codesign-bundle.sh
@@ -12,7 +12,7 @@ source codesign.conf
 
 # Sign the .app
 echo Signing ${BUNDLE}
-codesign --sign "${DEVELOPER_ID}" --verbose --deep --force "${BUNDLE}"
+codesign --sign "${DEVELOPER_ID}" --timestamp --verbose --deep --force "${BUNDLE}"
 
 # Verify it worked
 echo Verifying the signature
diff --git a/pkg/mac/codesign-dmg.sh b/pkg/mac/codesign-dmg.sh
index dbbad68f7..5fbd031c4 100755
--- a/pkg/mac/codesign-dmg.sh
+++ b/pkg/mac/codesign-dmg.sh
@@ -16,7 +16,7 @@ SCRIPT_DIR=`pwd`
 
 # Sign the .app
 echo Signing ${DMG_IMAGE}
-codesign --sign "${DEVELOPER_ID}" --verbose --force "${DMG_IMAGE}"
+codesign --sign "${DEVELOPER_ID}" --timestamp --verbose --force "${DMG_IMAGE}"
 
 # Verify it worked
 echo Verifying the signature
@@ -27,4 +27,4 @@ if [ ${RETURN_STATUS} -ne 0 ]; then
   exit 1
 else
   echo ${DMG_IMAGE} successfully signed
-fi
\ No newline at end of file
+fi
diff --git a/pkg/mac/pgadmin.Info.plist.in b/pkg/mac/pgadmin.Info.plist.in
index fb57ac894..1aeac6e1e 100644
--- a/pkg/mac/pgadmin.Info.plist.in
+++ b/pkg/mac/pgadmin.Info.plist.in
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>pgAdmin4</string>
+	<string>pgAdmin 4</string>
 	<key>CFBundleGetInfoString</key>
 	<string>pgAdmin4 PGADMIN_LONG_VERSION</string>
 	<key>CFBundleIconFile</key>