diff --git a/Makefile b/Makefile
index 08021da99f6c149509d74bc25b75cd12e88b8b40..94afb38193f5ac1edd3945c44103dd423b382935 100644
--- a/Makefile
+++ b/Makefile
@@ -257,6 +257,7 @@ notarize_all:
 	APPNAME=${APPNAME} VERSION=${VERSION} TARGET=${TARGET} OSXAPPPASS=${OSXAPPPASS} branding/scripts/osx-stapler.sh
 
 # --------------------
+# TODO test and remove
 
 notarize_installer:
 # courtesy of https://skyronic.com/2019/07/app-notarization-for-qt-applications/
@@ -278,10 +279,10 @@ create_dmg:
 ifeq (${PLATFORM}, darwin)
 	@create-dmg deploy/${APPNAME}-${VERSION}.dmg build/installer/${APPNAME}-installer-${VERSION}.app
 endif
-
 # --------------------
 
 
+
 check_qtifw:
 ifdef HAS_QTIFW
 	@echo "[+] Found QTIFW"
diff --git a/branding/scripts/osx-stapler.sh b/branding/scripts/osx-stapler.sh
index 5017f0b957cac2fb8da94a151921910b7633ae21..377d6eba3c6156516dde788c1d05ddaa9f326488 100755
--- a/branding/scripts/osx-stapler.sh
+++ b/branding/scripts/osx-stapler.sh
@@ -14,9 +14,9 @@ requestInfo=$(xcrun altool --notarize-app \
 	-u ${USER} \
 	-p ${OSXAPPPASS})
 
-uuid=$(python branding/scripts/osx-get-uuid.py $requestInfo)
+uuid=$(python3 branding/scripts/osx-staple-uuid.py $requestInfo)
 
-current_status = "in progress"
+current_status="in progress"
 
 while [[ "$currentStatus" == "in progress" ]]; do
 
@@ -25,7 +25,7 @@ sleep 15
 statusResponse=$(xcrun altool --notarization-info "$uuid" \
     --username ${USER} \
     --password ${OSXAPPPASS})
-current_status=$(python branding/scripts/osx-get-status.py $statusResponse)
+current_status=$(python3 branding/scripts/osx-staple-status.py $statusResponse)
 done