diff --git a/go.mod b/go.mod
index c5f5d353..13149ade 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/bitrise-io/go-utils v1.0.11
 	github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.20
 	github.com/bitrise-io/go-xcode v1.0.18
-	github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.38
+	github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.39
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/stretchr/testify v1.8.4
 	gopkg.in/yaml.v3 v3.0.1
diff --git a/go.sum b/go.sum
index b91817d9..d1d6c304 100644
--- a/go.sum
+++ b/go.sum
@@ -13,8 +13,8 @@ github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.20 h1:R+xJRWsuHhF/Pnx0gjI1+HH4Y0Y
 github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.20/go.mod h1:Laih4ji980SQkRgdnMCH0g4u2GZI/5nnbqmYT9UfKFQ=
 github.com/bitrise-io/go-xcode v1.0.18 h1:guFywV/AwcZuexqIQkL1ixc3QThpbJvA4voa9MqvPto=
 github.com/bitrise-io/go-xcode v1.0.18/go.mod h1:9OwsvrhZ4A2JxHVoEY7CPcABAKA+OE7FQqFfBfvbFuY=
-github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.38 h1:4p/9wsiSYaxSzS2hxJ+HBIhEXzmUWpd9cPTZoHYLwgk=
-github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.38/go.mod h1:Y3K7ay6Q+znVKFmGGvr4jijnN8QmTBxB5+CatRtBl30=
+github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.39 h1:C7PXXl9vSZUgq5gKzOkZd9s2kjQZzfwRp9HXcmQIPCY=
+github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.39/go.mod h1:Y3K7ay6Q+znVKFmGGvr4jijnN8QmTBxB5+CatRtBl30=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
diff --git a/vendor/github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/spaceship/spaceship.go b/vendor/github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/spaceship/spaceship.go
index 1730fbe7..c858a087 100644
--- a/vendor/github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/spaceship/spaceship.go
+++ b/vendor/github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/spaceship/spaceship.go
@@ -50,14 +50,35 @@ func NewClient(authConfig appleauth.AppleID, teamID string, cmdFactory ruby.Comm
 		cmdFactory: cmdFactory,
 	}
 
-	_, err = c.runSpaceshipCommand("login")
+	currentTeamID, err := c.login()
 	if err != nil {
-		return nil, fmt.Errorf("running command failed with error: %s", err)
+		return nil, fmt.Errorf("spaceship command failed: %s", err)
 	}
 
+	log.Debugf("current team id: %s", currentTeamID)
+
+	c.teamID = currentTeamID
+
 	return c, nil
 }
 
+func (c *Client) login() (string, error) {
+	output, err := c.runSpaceshipCommand("login")
+	if err != nil {
+		return "", fmt.Errorf("running command failed with error: %s", err)
+	}
+
+	// {"data":"72SA8V3WYL"}
+	var teamIDResponse struct {
+		Data string `json:"data"`
+	}
+	if err := json.Unmarshal([]byte(output), &teamIDResponse); err != nil {
+		return "", fmt.Errorf("failed to unmarshal response: %v", err)
+	}
+
+	return teamIDResponse.Data, nil
+}
+
 // DevPortalClient ...
 type DevPortalClient struct {
 	*CertificateSource
diff --git a/vendor/github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/spaceship/spaceship/main.rb b/vendor/github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/spaceship/spaceship/main.rb
index 6efea6cf..9fda66bd 100644
--- a/vendor/github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/spaceship/spaceship/main.rb
+++ b/vendor/github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/spaceship/spaceship/main.rb
@@ -27,9 +27,12 @@
 
   FastlaneCore::Globals.verbose = true
 
+  result = '{}'
+
   if options[:subcommand] == 'login'
     begin
-      Portal::AuthClient.login(options[:username], options[:password], options[:session], options[:team_id])
+      team_id = Portal::AuthClient.login(options[:username], options[:password], options[:session], options[:team_id])
+      result = team_id
     rescue => e
       puts "\nApple ID authentication failed: #{e}"
       exit(1)
@@ -37,7 +40,6 @@
   else
     Portal::AuthClient.restore_from_session(options[:username], options[:team_id])
 
-    result = '{}'
     case options[:subcommand]
     when 'list_dev_certs'
       client = CertificateHelper.new
diff --git a/vendor/github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/spaceship/spaceship/portal/auth_client.rb b/vendor/github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/spaceship/spaceship/portal/auth_client.rb
index b8b85d3f..fdbb08e7 100644
--- a/vendor/github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/spaceship/spaceship/portal/auth_client.rb
+++ b/vendor/github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/spaceship/spaceship/portal/auth_client.rb
@@ -17,6 +17,8 @@ def self.login(username, password, two_factor_session = nil, team_id = nil)
       end
 
       client.store_cookie
+
+      client.team_id
     end
 
     def self.restore_from_session(username, team_id)
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 71de6fa8..bf5d66c7 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -60,7 +60,7 @@ github.com/bitrise-io/go-xcode/xcodeproject/xcodeproj
 github.com/bitrise-io/go-xcode/xcodeproject/xcscheme
 github.com/bitrise-io/go-xcode/xcodeproject/xcworkspace
 github.com/bitrise-io/go-xcode/xcpretty
-# github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.38
+# github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.39
 ## explicit; go 1.20
 github.com/bitrise-io/go-xcode/v2/autocodesign
 github.com/bitrise-io/go-xcode/v2/autocodesign/certdownloader