diff --git a/mac/Focalboard.xcodeproj/project.pbxproj b/mac/Focalboard.xcodeproj/project.pbxproj
index 49d682c4c..2ae1515c9 100644
--- a/mac/Focalboard.xcodeproj/project.pbxproj
+++ b/mac/Focalboard.xcodeproj/project.pbxproj
@@ -274,7 +274,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Comment out codesign for now\n# /usr/bin/codesign --force --sign \"$CODE_SIGN_IDENTITY\" -i \"com.mattermost.FocalboardServer\" --entitlement \"$PROJECT_DIR/Focalboard/Inherit.entitlements\" \"$BUILD_DIR/$CONFIGURATION/$EXECUTABLE_FOLDER_PATH/../Resources/resources/bin/focalboard-server\"\n";
+			shellScript = "# Un-comment this to enable codesign\n# /usr/bin/codesign --force --timestamp --options runtime --sign \"$CODE_SIGN_IDENTITY\" -i \"com.mattermost.FocalboardServer\" --entitlement \"$PROJECT_DIR/Focalboard/Inherit.entitlements\" \"$BUILD_DIR/$CONFIGURATION/$EXECUTABLE_FOLDER_PATH/../Resources/resources/bin/focalboard-server\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -453,9 +453,10 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Focalboard/Focalboard.entitlements;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
+				DEVELOPMENT_TEAM = HFP57A3MYB;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Focalboard/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -475,9 +476,10 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Focalboard/Focalboard.entitlements;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
+				DEVELOPMENT_TEAM = HFP57A3MYB;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Focalboard/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (