diff --git a/utils/config/tokenrefresh.go b/utils/config/tokenrefresh.go
index e8f4da70b..b181aa0e4 100644
--- a/utils/config/tokenrefresh.go
+++ b/utils/config/tokenrefresh.go
@@ -143,7 +143,7 @@ func refreshArtifactoryTokenAndWriteToConfig(serverConfiguration *ServerDetails,
 		log.Debug("Token refreshed successfully.")
 	}
 
-	err = writeNewArtifactoryTokens(serverConfiguration, tokenRefreshServerId, newToken.AccessToken, newToken.RefreshToken)
+	err = writeNewTokens(serverConfiguration, tokenRefreshServerId, newToken.AccessToken, newToken.RefreshToken, true)
 	return newToken.AccessToken, err
 }
 
@@ -153,13 +153,18 @@ func refreshAccessTokenAndWriteToConfig(serverConfiguration *ServerDetails, curr
 	if err != nil {
 		return "", errorutils.CheckErrorf("Refresh access token failed: " + err.Error())
 	}
-	err = writeNewArtifactoryTokens(serverConfiguration, tokenRefreshServerId, newToken.AccessToken, newToken.RefreshToken)
+	err = writeNewTokens(serverConfiguration, tokenRefreshServerId, newToken.AccessToken, newToken.RefreshToken, false)
 	return newToken.AccessToken, err
 }
 
-func writeNewArtifactoryTokens(serverConfiguration *ServerDetails, serverId, accessToken, refreshToken string) error {
+func writeNewTokens(serverConfiguration *ServerDetails, serverId, accessToken, refreshToken string, isArtifactoryTokens bool) error {
 	serverConfiguration.SetAccessToken(accessToken)
-	serverConfiguration.SetArtifactoryRefreshToken(refreshToken)
+
+	if isArtifactoryTokens {
+		serverConfiguration.SetArtifactoryRefreshToken(refreshToken)
+	} else {
+		serverConfiguration.SetRefreshToken(refreshToken)
+	}
 
 	// Get configurations list
 	configurations, err := GetAllServersConfigs()
@@ -221,7 +226,7 @@ func CreateInitialRefreshableTokensIfNeeded(serverDetails *ServerDetails) (err e
 	}
 	// Remove initializing value.
 	serverDetails.ArtifactoryTokenRefreshInterval = 0
-	err = writeNewArtifactoryTokens(serverDetails, serverDetails.ServerId, newToken.AccessToken, newToken.RefreshToken)
+	err = writeNewTokens(serverDetails, serverDetails.ServerId, newToken.AccessToken, newToken.RefreshToken, true)
 	return
 }