diff --git a/.includes/bottle.sh b/.includes/bottle.sh
index 2062f7a..224491e 100644
--- a/.includes/bottle.sh
+++ b/.includes/bottle.sh
@@ -5,6 +5,14 @@ get_bottle() {
     local architecture="${1:-win64}"
     architecture="${architecture/win/}"
     export WINEPREFIX="$HOME/.local/wine${architecture}"
+    
+    # Set wine executables based on architecture
+    if [[ "$architecture" == "32" ]] && [[ -n "$wine32" ]]; then
+        export WINE="$wine32"
+        export WINESERVER="$wine32server"
+    else
+        unset WINE WINESERVER  # Use system defaults
+    fi
 }
 
 # Note: install_wine function removed - we now use system wine with simplified bottle management
diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index 7d1d0a5..182cc58 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -48,25 +48,6 @@ check_wine32() {
     fi
 }
 
-# Wine function overrides for automatic architecture detection
-wine() {
-    if [[ "$WINEPREFIX" =~ wine32 ]] && [[ -n "$wine32" ]]; then
-        "$wine32" "$@"
-    else
-        command wine "$@"
-    fi
-}
-
-wineserver() {
-    if [[ "$WINEPREFIX" =~ wine32 ]] && [[ -n "$wine32server" ]]; then
-        "$wine32server" "$@"
-    else
-        command wineserver "$@"
-    fi
-}
-
-# Export functions so they're available in subshells and sourced scripts
-export -f wine wineserver
 
 # Install games
 game_installer() {