diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index 0970a9c1..7cd47c9f 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -177,7 +177,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: SideStore-${{ steps.version.outputs.version }}-dSYM
-          path: ./*.dSYM/
+          path: ./SideStore.xcarchive/dSYMs/
 
       - name: Get short commit hash
         run: |
diff --git a/.gitignore b/.gitignore
index a4ac0ad8..94380a7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@ Pods/
 build/
 DerivedData
 
-archive.xcarchive
+SideStore.xcarchive
 ## Various settings
 *.pbxuser
 !default.pbxuser
diff --git a/Makefile b/Makefile
index 56e63806..f546cdcd 100755
--- a/Makefile
+++ b/Makefile
@@ -178,28 +178,36 @@ print_release_type:
 	@echo ""
 
 # Build target with the print_commit_id dependency
+
+# NOTE: The build config was implicitly 'release' since it was set in AltStore.project
+#       under "use "Release" configuration for commandline builds" setting
+#		so I had just defined it explicitly.
+#
+#       However the scheme used is Debug Scheme, so it was deliberately 
+#       using scheme = Debug and config = Release (so I have kept it as-is) 
 build: print_release_type
 	@xcodebuild -workspace AltStore.xcworkspace \
 				-scheme SideStore \
 				-sdk iphoneos \
-				archive -archivePath ./archive \
+				-configuration release \
+				archive -archivePath ./SideStore \
 				CODE_SIGNING_REQUIRED=NO \
 				AD_HOC_CODE_SIGNING_ALLOWED=YES \
 				CODE_SIGNING_ALLOWED=NO \
 				DEVELOPMENT_TEAM=XYZ0123456 \
 				ORG_IDENTIFIER=com.SideStore \
-				DWARF_DSYM_FOLDER_PATH="." \
 				BUILD_REVISION=$(ALPHA_COMMIT_ID)
+#				DWARF_DSYM_FOLDER_PATH="."
 
 fakesign:
-	rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/
-	ldid -SAltStore/Resources/ReleaseEntitlements.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore
-	ldid -SAltWidget/Resources/ReleaseEntitlements.plist archive.xcarchive/Products/Applications/SideStore.app/PlugIns/AltWidgetExtension.appex/AltWidgetExtension
+	rm -rf SideStore.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/
+	ldid -SAltStore/Resources/ReleaseEntitlements.plist SideStore.xcarchive/Products/Applications/SideStore.app/SideStore
+	ldid -SAltWidget/Resources/ReleaseEntitlements.plist SideStore.xcarchive/Products/Applications/SideStore.app/PlugIns/AltWidgetExtension.appex/AltWidgetExtension
 
 ipa:
 	mkdir Payload
 	mkdir Payload/SideStore.app
-	cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/
+	cp -R SideStore.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/
 	zip -r SideStore.ipa Payload
 
 # Global Variables