Index: build/cackey_osx_build/Template_pmbuild/scripts/04pkcs11tokend-post.sh
==================================================================
--- build/cackey_osx_build/Template_pmbuild/scripts/04pkcs11tokend-post.sh
+++ build/cackey_osx_build/Template_pmbuild/scripts/04pkcs11tokend-post.sh
@@ -3,6 +3,7 @@
 chown -R root:wheel /Library/Security/tokend/PKCS11.tokend
 
 # If on Sierra or newer, disable the pivtoken CryptoTokenKit
 if [ "`uname -r | cut -d '.' -f 1`" -ge "16" ]; then
 	security smartcards token -d com.apple.CryptoTokenKit.pivtoken
+	defaults write /Library/Preferences/com.apple.security.smartcard DisabledTokens -array com.apple.CryptoTokenKit.pivtoken
 fi

Index: build/cackey_osx_build/cackey_osx_uninstall.sh
==================================================================
--- build/cackey_osx_build/cackey_osx_uninstall.sh
+++ build/cackey_osx_build/cackey_osx_uninstall.sh
@@ -22,6 +22,7 @@
 
 # If on Sierra or newer, reenable the pivtoken CryptoTokenKit
 echo "Reenabling the builtin pivtoken CryptoTokenKit..."
 if [ "`uname -r | cut -d '.' -f 1`" -ge "16" ]; then
 	security smartcards token -e com.apple.CryptoTokenKit.pivtoken
+	defaults delete /Library/Preferences/com.apple.security.smartcard DisabledTokens -array com.apple.CryptoTokenKit.pivtoken
 fi