diff --git a/packages/dashboard-frontend/src/pages/UserPreferences/GitServices/List/StatusIcon/index.tsx b/packages/dashboard-frontend/src/pages/UserPreferences/GitServices/List/StatusIcon/index.tsx
index 4555a96b8..c23b5d60f 100644
--- a/packages/dashboard-frontend/src/pages/UserPreferences/GitServices/List/StatusIcon/index.tsx
+++ b/packages/dashboard-frontend/src/pages/UserPreferences/GitServices/List/StatusIcon/index.tsx
@@ -29,18 +29,12 @@ export type Props = {
 export class GitServiceStatusIcon extends React.PureComponent<Props> {
   private isSkipOauth(): boolean {
     const { gitProvider, skipOauthProviders } = this.props;
-    // Use includes filter to handle the bitbucket-server oauth 2 provider.
-    // The bitbucket server oauth2 provider name is 'bitbucket',
-    // but the corresponding 'skip oauth' item is 'bitbucket-server'.
-    return skipOauthProviders.some(s => s.includes(gitProvider));
+    return skipOauthProviders.includes(gitProvider);
   }
 
   private hasOauthToken(): boolean {
     const { gitProvider, providersWithToken } = this.props;
-    // Use includes filter to handle the bitbucket-server oauth 2 provider.
-    // The bitbucket server oauth2 provider name is 'bitbucket',
-    // but the corresponding 'provider with token' item is 'bitbucket-server'.
-    return providersWithToken.some(p => p.includes(gitProvider));
+    return providersWithToken.includes(gitProvider);
   }
 
   public render(): React.ReactElement {
diff --git a/packages/dashboard-frontend/src/pages/UserPreferences/GitServices/List/index.tsx b/packages/dashboard-frontend/src/pages/UserPreferences/GitServices/List/index.tsx
index b86d6854c..ed2e8eb25 100644
--- a/packages/dashboard-frontend/src/pages/UserPreferences/GitServices/List/index.tsx
+++ b/packages/dashboard-frontend/src/pages/UserPreferences/GitServices/List/index.tsx
@@ -191,10 +191,7 @@ export class GitServicesList extends React.PureComponent<Props, State> {
   }
 
   private hasSkipOauth(providerName: api.GitOauthProvider): boolean {
-    // Use includes filter to handle the bitbucket-server oauth 2 provider.
-    // The bitbucket server oauth2 provider name is 'bitbucket',
-    // but the corresponding 'skip oauth' item is 'bitbucket-server'.
-    return this.props.skipOauthProviders.some(s => s.includes(providerName));
+    return this.props.skipOauthProviders.includes(providerName);
   }
 
   private hasOauthToken(providerName: api.GitOauthProvider): boolean {
@@ -207,10 +204,7 @@ export class GitServicesList extends React.PureComponent<Props, State> {
   }
 
   private handleClearService(service: IGitOauth): void {
-    // Use includes filter to handle the bitbucket-server oauth 2 provider.
-    // The bitbucket server oauth2 provider name is 'bitbucket',
-    // but the corresponding 'skip oauth' item is 'bitbucket-server'.
-    const serviceToClear = this.props.skipOauthProviders.find(s => s.includes(service.name));
+    const serviceToClear = this.props.skipOauthProviders.find(s => s === service.name);
     if (serviceToClear != undefined) {
       this.props.onClearService(serviceToClear);
       this.deselectServices([service]);
diff --git a/packages/dashboard-frontend/src/pages/UserPreferences/const.ts b/packages/dashboard-frontend/src/pages/UserPreferences/const.ts
index 73286bc42..516fc639e 100644
--- a/packages/dashboard-frontend/src/pages/UserPreferences/const.ts
+++ b/packages/dashboard-frontend/src/pages/UserPreferences/const.ts
@@ -16,7 +16,7 @@ export const GIT_OAUTH_PROVIDERS: Record<api.GitOauthProvider, string> = {
   'azure-devops': 'Microsoft Azure DevOps',
   // Either Bitbucket Cloud or Bitbucket Server
   // https://github.com/eclipse-che/che-server/blob/main/wsmaster/che-core-api-auth-bitbucket/src/main/java/org/eclipse/che/security/oauth/BitbucketOAuthAuthenticator.java
-  'bitbucket-server': 'Bitbucket (OAuth 1.0)',
+  'bitbucket-server': 'Bitbucket',
   // Bitbucket Server only
   // https://github.com/eclipse-che/che-server/blob/main/wsmaster/che-core-api-auth-bitbucket/src/main/java/org/eclipse/che/security/oauth1/BitbucketServerOAuthAuthenticator.java
   bitbucket: 'Bitbucket',