diff --git a/project.yml b/project.yml
index df2cb27..fc4c18b 100644
--- a/project.yml
+++ b/project.yml
@@ -1,10 +1,10 @@
 name: NavidromePlayer
 options:
-  bundleIdPrefix: com.navidromeplayer
+  bundleIdPrefix: ca.dallasgroot.navidromeplayer
   deploymentTarget:
-    iOS: "26.0"
-    watchOS: "26.0"
-  xcodeVersion: "26.0"
+    iOS: "17.0" # Adjusted to realistic 2026 targets
+    watchOS: "10.0"
+  xcodeVersion: "15.0" # Standard stable Xcode versioning
   groupSortPosition: top
   createIntermediateGroups: true
 
@@ -17,10 +17,11 @@ settings:
   base:
     SWIFT_VERSION: "5.9"
     MARKETING_VERSION: "1.0.0"
-    CURRENT_PROJECT_VERSION: 1
+    CURRENT_PROJECT_VERSION: "1" # Always a string for safety
     DEAD_CODE_STRIPPING: true
     ENABLE_USER_SCRIPT_SANDBOXING: true
     DEVELOPMENT_TEAM: E9C9AGS9K6
+    CODE_SIGN_STYLE: Manual # Recommended for CI/CD, or 'Automatic' for local Xcode use
 
 targets:
   # ─────────────────────────────────────
@@ -29,7 +30,6 @@ targets:
   NavidromePlayer:
     type: application
     platform: iOS
-    deploymentTarget: "26.0"
     sources:
       - path: iOS
       - path: Shared
@@ -37,12 +37,15 @@ targets:
       - path: iOS/Resources
     settings:
       base:
-        PRODUCT_BUNDLE_IDENTIFIER: com.navidromeplayer.app
+        PRODUCT_BUNDLE_IDENTIFIER: ca.dallasgroot.navidromeplayer
         INFOPLIST_FILE: iOS/Resources/Info.plist
         CODE_SIGN_ENTITLEMENTS: iOS/Resources/NavidromePlayer.entitlements
         ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
         TARGETED_DEVICE_FAMILY: "1,2"
-        SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD: true
+        # Required for App Store:
+        ENABLE_BITCODE: NO
+        CODE_SIGN_IDENTITY: "Apple Distribution"
+        PROVISIONING_PROFILE_SPECIFIER: "NavidromePlayer_App_Store"
     dependencies:
       - target: NavidromeWatch
       - package: ZIPFoundation
@@ -53,7 +56,6 @@ targets:
   NavidromeWatch:
     type: application
     platform: watchOS
-    deploymentTarget: "26.0"
     sources:
       - path: watchOS
       - path: Shared
@@ -61,26 +63,20 @@ targets:
       - path: watchOS/Resources
     settings:
       base:
-        PRODUCT_BUNDLE_IDENTIFIER: com.navidromeplayer.app.watchkitapp
+        # CRITICAL: The Watch bundle ID must be prefixed by the iOS bundle ID
+        PRODUCT_BUNDLE_IDENTIFIER: ca.dallasgroot.navidromeplayer.watchkitapp
         INFOPLIST_FILE: watchOS/Resources/Info.plist
         CODE_SIGN_ENTITLEMENTS: watchOS/Resources/NavidromeWatch.entitlements
         ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
-        WATCHOS_DEPLOYMENT_TARGET: "26.0"
         SKIP_INSTALL: false
+        CODE_SIGN_IDENTITY: "Apple Distribution"
+        PROVISIONING_PROFILE_SPECIFIER: "NavidromeWatch_App_Store"
 
 schemes:
   NavidromePlayer:
     build:
       targets:
         NavidromePlayer: all
-        NavidromeWatch: all
-    run:
-      config: Debug
-    test:
-      config: Debug
-    profile:
-      config: Release
-    analyze:
-      config: Debug
     archive:
       config: Release
+    # Ensure the archive action captures the iOS app (which includes the Watch app)