diff --git a/diworker/diworker/importers/gcp.py b/diworker/diworker/importers/gcp.py
index 1f5ea9aea..9e4b36c8d 100644
--- a/diworker/diworker/importers/gcp.py
+++ b/diworker/diworker/importers/gcp.py
@@ -27,7 +27,7 @@ def detect_period_start(self):
             if last_exp_date:
                 self.period_start = last_exp_date.replace(
                     hour=0, minute=0, second=0, microsecond=0) - timedelta(
-                    days=1)
+                    days=3)
         if not self.period_start:
             super().detect_period_start()
 
diff --git a/ngui/server/api/restapi/client.ts b/ngui/server/api/restapi/client.ts
index 906959239..c5397e53f 100644
--- a/ngui/server/api/restapi/client.ts
+++ b/ngui/server/api/restapi/client.ts
@@ -67,6 +67,7 @@ class RestApiClient extends BaseClient {
           ...params.azureSubscriptionConfig,
           ...params.azureTenantConfig,
           ...params.gcpConfig,
+          ...params.gcpTenantConfig,
           ...params.alibabaConfig,
           ...params.nebiusConfig,
           ...params.databricksConfig,
@@ -95,6 +96,7 @@ class RestApiClient extends BaseClient {
           ...params.azureSubscriptionConfig,
           ...params.azureTenantConfig,
           ...params.gcpConfig,
+          ...params.gcpTenantConfig,
           ...params.alibabaConfig,
           ...params.nebiusConfig,
           ...params.databricksConfig,
diff --git a/ngui/server/graphql/resolvers/restapi.generated.ts b/ngui/server/graphql/resolvers/restapi.generated.ts
index ee8e569f9..6874e9944 100644
--- a/ngui/server/graphql/resolvers/restapi.generated.ts
+++ b/ngui/server/graphql/resolvers/restapi.generated.ts
@@ -160,6 +160,7 @@ export type CreateDataSourceInput = {
   azureTenantConfig?: InputMaybe<AzureTenantConfigInput>;
   databricksConfig?: InputMaybe<DatabricksConfigInput>;
   gcpConfig?: InputMaybe<GcpConfigInput>;
+  gcpTenantConfig?: InputMaybe<GcpTenantConfigInput>;
   k8sConfig?: InputMaybe<K8sConfigInput>;
   name?: InputMaybe<Scalars['String']['input']>;
   nebiusConfig?: InputMaybe<NebiusConfigInput>;
@@ -190,18 +191,18 @@ export type DataSourceDiscoveryInfos = {
 };
 
 export type DataSourceInterface = {
-  account_id: Scalars['String']['output'];
+  account_id?: Maybe<Scalars['String']['output']>;
   details?: Maybe<DataSourceDetails>;
-  id: Scalars['String']['output'];
-  last_getting_metric_attempt_at: Scalars['Int']['output'];
+  id?: Maybe<Scalars['String']['output']>;
+  last_getting_metric_attempt_at?: Maybe<Scalars['Int']['output']>;
   last_getting_metric_attempt_error?: Maybe<Scalars['String']['output']>;
-  last_getting_metrics_at: Scalars['Int']['output'];
-  last_import_at: Scalars['Int']['output'];
-  last_import_attempt_at: Scalars['Int']['output'];
+  last_getting_metrics_at?: Maybe<Scalars['Int']['output']>;
+  last_import_at?: Maybe<Scalars['Int']['output']>;
+  last_import_attempt_at?: Maybe<Scalars['Int']['output']>;
   last_import_attempt_error?: Maybe<Scalars['String']['output']>;
-  name: Scalars['String']['output'];
+  name?: Maybe<Scalars['String']['output']>;
   parent_id?: Maybe<Scalars['String']['output']>;
-  type: DataSourceType;
+  type?: Maybe<DataSourceType>;
 };
 
 export type DataSourceRequestParams = {
@@ -216,6 +217,7 @@ export enum DataSourceType {
   Databricks = 'databricks',
   Environment = 'environment',
   GcpCnr = 'gcp_cnr',
+  GcpTenant = 'gcp_tenant',
   KubernetesCnr = 'kubernetes_cnr',
   Nebius = 'nebius'
 }
@@ -320,6 +322,40 @@ export type GcpDataSource = DataSourceInterface & {
   type: DataSourceType;
 };
 
+export type GcpTenantBillingDataConfig = {
+  __typename?: 'GcpTenantBillingDataConfig';
+  dataset_name?: Maybe<Scalars['String']['output']>;
+  project_id?: Maybe<Scalars['String']['output']>;
+  table_name?: Maybe<Scalars['String']['output']>;
+};
+
+export type GcpTenantConfig = {
+  __typename?: 'GcpTenantConfig';
+  billing_data?: Maybe<GcpTenantBillingDataConfig>;
+};
+
+export type GcpTenantConfigInput = {
+  billing_data: GcpBillingDataConfigInput;
+  credentials: Scalars['JSONObject']['input'];
+};
+
+export type GcpTenantDataSource = DataSourceInterface & {
+  __typename?: 'GcpTenantDataSource';
+  account_id?: Maybe<Scalars['String']['output']>;
+  config?: Maybe<GcpTenantConfig>;
+  details?: Maybe<DataSourceDetails>;
+  id: Scalars['String']['output'];
+  last_getting_metric_attempt_at: Scalars['Int']['output'];
+  last_getting_metric_attempt_error?: Maybe<Scalars['String']['output']>;
+  last_getting_metrics_at: Scalars['Int']['output'];
+  last_import_at: Scalars['Int']['output'];
+  last_import_attempt_at: Scalars['Int']['output'];
+  last_import_attempt_error?: Maybe<Scalars['String']['output']>;
+  name: Scalars['String']['output'];
+  parent_id?: Maybe<Scalars['String']['output']>;
+  type: DataSourceType;
+};
+
 export type Invitation = {
   __typename?: 'Invitation';
   id: Scalars['String']['output'];
@@ -334,6 +370,7 @@ export type InvitationAssignment = {
   id: Scalars['String']['output'];
   purpose: Scalars['String']['output'];
   scope_id: Scalars['String']['output'];
+  scope_name: Scalars['String']['output'];
   scope_type: Scalars['String']['output'];
 };
 
@@ -577,6 +614,7 @@ export type UpdateDataSourceInput = {
   azureTenantConfig?: InputMaybe<AzureTenantConfigInput>;
   databricksConfig?: InputMaybe<DatabricksConfigInput>;
   gcpConfig?: InputMaybe<GcpConfigInput>;
+  gcpTenantConfig?: InputMaybe<GcpTenantConfigInput>;
   k8sConfig?: InputMaybe<K8sConfigInput>;
   lastImportAt?: InputMaybe<Scalars['Int']['input']>;
   lastImportModifiedAt?: InputMaybe<Scalars['Int']['input']>;
@@ -674,7 +712,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
 
 /** Mapping of interface types */
 export type ResolversInterfaceTypes<_RefType extends Record<string, unknown>> = {
-  DataSourceInterface: ( AlibabaDataSource ) | ( AwsDataSource ) | ( AzureSubscriptionDataSource ) | ( AzureTenantDataSource ) | ( DatabricksDataSource ) | ( EnvironmentDataSource ) | ( GcpDataSource ) | ( K8sDataSource ) | ( NebiusDataSource );
+  DataSourceInterface: ( AlibabaDataSource ) | ( AwsDataSource ) | ( AzureSubscriptionDataSource ) | ( AzureTenantDataSource ) | ( DatabricksDataSource ) | ( EnvironmentDataSource ) | ( GcpDataSource ) | ( GcpTenantDataSource ) | ( K8sDataSource ) | ( NebiusDataSource );
 };
 
 /** Mapping between all available schema types and the resolvers types */
@@ -711,6 +749,10 @@ export type ResolversTypes = {
   GcpConfig: ResolverTypeWrapper<GcpConfig>;
   GcpConfigInput: GcpConfigInput;
   GcpDataSource: ResolverTypeWrapper<GcpDataSource>;
+  GcpTenantBillingDataConfig: ResolverTypeWrapper<GcpTenantBillingDataConfig>;
+  GcpTenantConfig: ResolverTypeWrapper<GcpTenantConfig>;
+  GcpTenantConfigInput: GcpTenantConfigInput;
+  GcpTenantDataSource: ResolverTypeWrapper<GcpTenantDataSource>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   Invitation: ResolverTypeWrapper<Invitation>;
@@ -769,6 +811,10 @@ export type ResolversParentTypes = {
   GcpConfig: GcpConfig;
   GcpConfigInput: GcpConfigInput;
   GcpDataSource: GcpDataSource;
+  GcpTenantBillingDataConfig: GcpTenantBillingDataConfig;
+  GcpTenantConfig: GcpTenantConfig;
+  GcpTenantConfigInput: GcpTenantConfigInput;
+  GcpTenantDataSource: GcpTenantDataSource;
   ID: Scalars['ID']['output'];
   Int: Scalars['Int']['output'];
   Invitation: Invitation;
@@ -917,19 +963,19 @@ export type DataSourceDiscoveryInfosResolvers<ContextType = any, ParentType exte
 };
 
 export type DataSourceInterfaceResolvers<ContextType = any, ParentType extends ResolversParentTypes['DataSourceInterface'] = ResolversParentTypes['DataSourceInterface']> = {
-  __resolveType: TypeResolveFn<'AlibabaDataSource' | 'AwsDataSource' | 'AzureSubscriptionDataSource' | 'AzureTenantDataSource' | 'DatabricksDataSource' | 'EnvironmentDataSource' | 'GcpDataSource' | 'K8sDataSource' | 'NebiusDataSource', ParentType, ContextType>;
-  account_id?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  __resolveType: TypeResolveFn<'AlibabaDataSource' | 'AwsDataSource' | 'AzureSubscriptionDataSource' | 'AzureTenantDataSource' | 'DatabricksDataSource' | 'EnvironmentDataSource' | 'GcpDataSource' | 'GcpTenantDataSource' | 'K8sDataSource' | 'NebiusDataSource', ParentType, ContextType>;
+  account_id?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   details?: Resolver<Maybe<ResolversTypes['DataSourceDetails']>, ParentType, ContextType>;
-  id?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  last_getting_metric_attempt_at?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  id?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  last_getting_metric_attempt_at?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
   last_getting_metric_attempt_error?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  last_getting_metrics_at?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  last_import_at?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  last_import_attempt_at?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  last_getting_metrics_at?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  last_import_at?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  last_import_attempt_at?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
   last_import_attempt_error?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   parent_id?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  type?: Resolver<ResolversTypes['DataSourceType'], ParentType, ContextType>;
+  type?: Resolver<Maybe<ResolversTypes['DataSourceType']>, ParentType, ContextType>;
 };
 
 export type DatabricksConfigResolvers<ContextType = any, ParentType extends ResolversParentTypes['DatabricksConfig'] = ResolversParentTypes['DatabricksConfig']> = {
@@ -1016,6 +1062,35 @@ export type GcpDataSourceResolvers<ContextType = any, ParentType extends Resolve
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
+export type GcpTenantBillingDataConfigResolvers<ContextType = any, ParentType extends ResolversParentTypes['GcpTenantBillingDataConfig'] = ResolversParentTypes['GcpTenantBillingDataConfig']> = {
+  dataset_name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  project_id?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  table_name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type GcpTenantConfigResolvers<ContextType = any, ParentType extends ResolversParentTypes['GcpTenantConfig'] = ResolversParentTypes['GcpTenantConfig']> = {
+  billing_data?: Resolver<Maybe<ResolversTypes['GcpTenantBillingDataConfig']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type GcpTenantDataSourceResolvers<ContextType = any, ParentType extends ResolversParentTypes['GcpTenantDataSource'] = ResolversParentTypes['GcpTenantDataSource']> = {
+  account_id?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  config?: Resolver<Maybe<ResolversTypes['GcpTenantConfig']>, ParentType, ContextType>;
+  details?: Resolver<Maybe<ResolversTypes['DataSourceDetails']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  last_getting_metric_attempt_at?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  last_getting_metric_attempt_error?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  last_getting_metrics_at?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  last_import_at?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  last_import_attempt_at?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  last_import_attempt_error?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  parent_id?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  type?: Resolver<ResolversTypes['DataSourceType'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
 export type InvitationResolvers<ContextType = any, ParentType extends ResolversParentTypes['Invitation'] = ResolversParentTypes['Invitation']> = {
   id?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   invite_assignments?: Resolver<Maybe<Array<ResolversTypes['InvitationAssignment']>>, ParentType, ContextType>;
@@ -1029,6 +1104,7 @@ export type InvitationAssignmentResolvers<ContextType = any, ParentType extends
   id?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   purpose?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   scope_id?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  scope_name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   scope_type?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
@@ -1156,6 +1232,9 @@ export type Resolvers<ContextType = any> = {
   GcpBillingDataConfig?: GcpBillingDataConfigResolvers<ContextType>;
   GcpConfig?: GcpConfigResolvers<ContextType>;
   GcpDataSource?: GcpDataSourceResolvers<ContextType>;
+  GcpTenantBillingDataConfig?: GcpTenantBillingDataConfigResolvers<ContextType>;
+  GcpTenantConfig?: GcpTenantConfigResolvers<ContextType>;
+  GcpTenantDataSource?: GcpTenantDataSourceResolvers<ContextType>;
   Invitation?: InvitationResolvers<ContextType>;
   InvitationAssignment?: InvitationAssignmentResolvers<ContextType>;
   JSONObject?: GraphQLScalarType;
diff --git a/ngui/server/graphql/resolvers/restapi.ts b/ngui/server/graphql/resolvers/restapi.ts
index 198555381..0e0423a13 100644
--- a/ngui/server/graphql/resolvers/restapi.ts
+++ b/ngui/server/graphql/resolvers/restapi.ts
@@ -19,6 +19,9 @@ const resolvers: Resolvers = {
         case "gcp_cnr": {
           return "GcpDataSource";
         }
+        case "gcp_tenant": {
+          return "GcpTenantDataSource";
+        }
         case "alibaba_cnr": {
           return "AlibabaDataSource";
         }
diff --git a/ngui/server/graphql/schemas/restapi.graphql b/ngui/server/graphql/schemas/restapi.graphql
index c5f73f934..37cbe6585 100644
--- a/ngui/server/graphql/schemas/restapi.graphql
+++ b/ngui/server/graphql/schemas/restapi.graphql
@@ -6,6 +6,7 @@ enum DataSourceType {
   azure_tenant
   azure_cnr
   gcp_cnr
+  gcp_tenant
   alibaba_cnr
   nebius
   databricks
@@ -35,16 +36,16 @@ type DataSourceDetails {
 }
 
 interface DataSourceInterface {
-  id: String!
-  name: String!
-  type: DataSourceType!
+  id: String
+  name: String
+  type: DataSourceType
   parent_id: String
-  account_id: String!
-  last_import_at: Int!
-  last_import_attempt_at: Int!
+  account_id: String
+  last_import_at: Int
+  last_import_attempt_at: Int
   last_import_attempt_error: String
-  last_getting_metrics_at: Int!
-  last_getting_metric_attempt_at: Int!
+  last_getting_metrics_at: Int
+  last_getting_metric_attempt_at: Int
   last_getting_metric_attempt_error: String
   details: DataSourceDetails
 }
@@ -151,6 +152,33 @@ type GcpDataSource implements DataSourceInterface {
   config: GcpConfig
 }
 
+# GCP tenant data source
+type GcpTenantBillingDataConfig {
+  dataset_name: String
+  table_name: String
+  project_id: String
+}
+
+type GcpTenantConfig {
+  billing_data: GcpTenantBillingDataConfig
+}
+
+type GcpTenantDataSource implements DataSourceInterface {
+  id: String!
+  name: String!
+  type: DataSourceType!
+  parent_id: String
+  account_id: String
+  last_import_at: Int!
+  last_import_attempt_at: Int!
+  last_import_attempt_error: String
+  last_getting_metrics_at: Int!
+  last_getting_metric_attempt_at: Int!
+  last_getting_metric_attempt_error: String
+  details: DataSourceDetails
+  config: GcpTenantConfig
+}
+
 # Alibaba data source
 type AlibabaConfig {
   access_key_id: String
@@ -309,6 +337,11 @@ input GcpConfigInput {
   credentials: JSONObject!
 }
 
+input GcpTenantConfigInput {
+  billing_data: GcpBillingDataConfigInput!
+  credentials: JSONObject!
+}
+
 input AlibabaConfigInput {
   access_key_id: String!
   secret_access_key: String!
@@ -344,6 +377,7 @@ input CreateDataSourceInput {
   azureSubscriptionConfig: AzureSubscriptionConfigInput
   azureTenantConfig: AzureTenantConfigInput
   gcpConfig: GcpConfigInput
+  gcpTenantConfig: GcpTenantConfigInput
   alibabaConfig: AlibabaConfigInput
   nebiusConfig: NebiusConfigInput
   databricksConfig: DatabricksConfigInput
@@ -359,6 +393,7 @@ input UpdateDataSourceInput {
   azureSubscriptionConfig: AzureSubscriptionConfigInput
   azureTenantConfig: AzureTenantConfigInput
   gcpConfig: GcpConfigInput
+  gcpTenantConfig: GcpTenantConfigInput
   alibabaConfig: AlibabaConfigInput
   nebiusConfig: NebiusConfigInput
   databricksConfig: DatabricksConfigInput
@@ -405,6 +440,7 @@ type Employee {
 type InvitationAssignment {
   id: String!
   scope_id: String!
+  scope_name: String!
   scope_type: String!
   purpose: String!
 }
diff --git a/ngui/ui/src/components/DataSourceCredentialFields/GcpTenantCredentials/GcpTenantCredentials.tsx b/ngui/ui/src/components/DataSourceCredentialFields/GcpTenantCredentials/GcpTenantCredentials.tsx
new file mode 100644
index 000000000..03a4b0231
--- /dev/null
+++ b/ngui/ui/src/components/DataSourceCredentialFields/GcpTenantCredentials/GcpTenantCredentials.tsx
@@ -0,0 +1,64 @@
+import { FormControl } from "@mui/material";
+import { FormattedMessage } from "react-intl";
+import { DropzoneArea } from "components/Dropzone";
+import { TextInput } from "components/forms/common/fields";
+import QuestionMark from "components/QuestionMark";
+import { ObjectValues } from "utils/types";
+
+export const FIELD_NAMES = Object.freeze({
+  CREDENTIALS: "credentials",
+  BILLING_DATA_DATASET: "billingDataDatasetName",
+  BILLING_DATA_TABLE: "billingDataTableName"
+});
+
+type FIELD_NAME = ObjectValues<typeof FIELD_NAMES>;
+
+type GcpTenantCredentialsProps = {
+  hidden?: FIELD_NAME[];
+};
+
+const GcpTenantCredentials = ({ hidden = [] }: GcpTenantCredentialsProps) => {
+  const isHidden = (fieldName: FIELD_NAME) => hidden.includes(fieldName);
+
+  return (
+    <>
+      <FormControl fullWidth>
+        <DropzoneArea acceptedFiles={["application/json"]} maxFileSizeMb={1} name={FIELD_NAMES.CREDENTIALS} />
+      </FormControl>
+      {!isHidden(FIELD_NAMES.BILLING_DATA_DATASET) && (
+        <TextInput
+          required
+          dataTestId="input_billing_data_dataset_name"
+          name={FIELD_NAMES.BILLING_DATA_DATASET}
+          InputProps={{
+            endAdornment: (
+              <QuestionMark
+                messageId="billingDataDatasetNameTooltip"
+                messageValues={{
+                  i: (chunks) => <i>{chunks}</i>
+                }}
+                dataTestId="qmark_billing_data_dataset_name"
+              />
+            )
+          }}
+          label={<FormattedMessage id="billingDataDatasetName" />}
+          autoComplete="off"
+        />
+      )}
+      {!isHidden(FIELD_NAMES.BILLING_DATA_DATASET) && (
+        <TextInput
+          required
+          dataTestId="input_billing_data_table_name"
+          name={FIELD_NAMES.BILLING_DATA_TABLE}
+          InputProps={{
+            endAdornment: <QuestionMark messageId="billingDataTableNameTooltip" dataTestId="qmark_billing_data_table_name" />
+          }}
+          label={<FormattedMessage id="billingDataTableName" />}
+          autoComplete="off"
+        />
+      )}
+    </>
+  );
+};
+
+export default GcpTenantCredentials;
diff --git a/ngui/ui/src/components/DataSourceCredentialFields/GcpTenantCredentials/index.ts b/ngui/ui/src/components/DataSourceCredentialFields/GcpTenantCredentials/index.ts
new file mode 100644
index 000000000..70cbe42b3
--- /dev/null
+++ b/ngui/ui/src/components/DataSourceCredentialFields/GcpTenantCredentials/index.ts
@@ -0,0 +1,4 @@
+import GcpTenantCredentials, { FIELD_NAMES } from "./GcpTenantCredentials";
+
+export { FIELD_NAMES };
+export default GcpTenantCredentials;
diff --git a/ngui/ui/src/components/DataSourceCredentialFields/index.ts b/ngui/ui/src/components/DataSourceCredentialFields/index.ts
index b73e8796e..068463188 100644
--- a/ngui/ui/src/components/DataSourceCredentialFields/index.ts
+++ b/ngui/ui/src/components/DataSourceCredentialFields/index.ts
@@ -10,6 +10,7 @@ import AzureSubscriptionCredentials, {
 import AzureTenantCredentials, { FIELD_NAMES as AZURE_TENANT_CREDENTIALS_FIELD_NAMES } from "./AzureTenantCredentials";
 import DatabricksCredentials, { FIELD_NAMES as DATABRICKS_CREDENTIALS_FIELD_NAMES } from "./DatabricksCredentials";
 import GcpCredentials, { FIELD_NAMES as GCP_CREDENTIALS_FIELD_NAMES } from "./GcpCredentials";
+import GcpTenantCredentials, { FIELD_NAMES as GCP_TENANT_CREDENTIALS_FIELD_NAMES } from "./GcpTenantCredentials";
 import KubernetesCredentials, { FIELD_NAMES as KUBERNETES_CREDENTIALS_FIELD_NAMES } from "./KubernetesCredentials";
 import NebiusCredentials from "./NebiusCredentials";
 
@@ -32,6 +33,8 @@ export {
   KUBERNETES_CREDENTIALS_FIELD_NAMES,
   GcpCredentials,
   GCP_CREDENTIALS_FIELD_NAMES,
+  GcpTenantCredentials,
+  GCP_TENANT_CREDENTIALS_FIELD_NAMES,
   AlibabaCredentials,
   ALIBABA_CREDENTIALS_FIELD_NAMES,
   NebiusCredentials,
diff --git a/ngui/ui/src/components/DataSourceDetails/DataSourceDetails.tsx b/ngui/ui/src/components/DataSourceDetails/DataSourceDetails.tsx
index e4de0837e..04beeb2fb 100644
--- a/ngui/ui/src/components/DataSourceDetails/DataSourceDetails.tsx
+++ b/ngui/ui/src/components/DataSourceDetails/DataSourceDetails.tsx
@@ -1,7 +1,17 @@
 import { Stack } from "@mui/material";
 import { FormattedMessage } from "react-intl";
 import SummaryList from "components/SummaryList";
-import { ALIBABA_CNR, AWS_CNR, AZURE_CNR, AZURE_TENANT, GCP_CNR, KUBERNETES_CNR, NEBIUS, DATABRICKS } from "utils/constants";
+import {
+  ALIBABA_CNR,
+  AWS_CNR,
+  AZURE_CNR,
+  AZURE_TENANT,
+  GCP_CNR,
+  KUBERNETES_CNR,
+  NEBIUS,
+  DATABRICKS,
+  GCP_TENANT
+} from "utils/constants";
 import { SPACING_2 } from "utils/layouts";
 import { ChildrenList } from "./ChildrenList";
 import { K8sHelp } from "./Help";
@@ -21,6 +31,7 @@ const DataSourceDetails = ({ id, accountId, parentId, type, config = {} }) => {
     [AZURE_CNR]: AzureProperties,
     [AZURE_TENANT]: AzureProperties,
     [GCP_CNR]: GcpProperties,
+    [GCP_TENANT]: GcpProperties,
     [ALIBABA_CNR]: AlibabaProperties,
     [KUBERNETES_CNR]: K8sProperties,
     [NEBIUS]: NebiusProperties,
@@ -32,7 +43,8 @@ const DataSourceDetails = ({ id, accountId, parentId, type, config = {} }) => {
   }[type];
 
   const childrenList = {
-    [AZURE_TENANT]: ChildrenList
+    [AZURE_TENANT]: ChildrenList,
+    [GCP_TENANT]: ChildrenList
   }[type];
 
   return (
diff --git a/ngui/ui/src/components/forms/ConnectCloudAccountForm/ConnectCloudAccountForm.tsx b/ngui/ui/src/components/forms/ConnectCloudAccountForm/ConnectCloudAccountForm.tsx
index a361ee85d..8935697f3 100644
--- a/ngui/ui/src/components/forms/ConnectCloudAccountForm/ConnectCloudAccountForm.tsx
+++ b/ngui/ui/src/components/forms/ConnectCloudAccountForm/ConnectCloudAccountForm.tsx
@@ -13,6 +13,7 @@ import {
   AZURE_TENANT_CREDENTIALS_FIELD_NAMES,
   AZURE_SUBSCRIPTION_CREDENTIALS_FIELD_NAMES,
   GCP_CREDENTIALS_FIELD_NAMES,
+  GCP_TENANT_CREDENTIALS_FIELD_NAMES,
   KUBERNETES_CREDENTIALS_FIELD_NAMES,
   DATABRICKS_CREDENTIALS_FIELD_NAMES,
   AWS_ROOT_CREDENTIALS_FIELD_NAMES,
@@ -65,7 +66,9 @@ import {
   NEBIUS,
   DATABRICKS,
   DATABRICKS_ACCOUNT,
-  OPTSCALE_MODE
+  OPTSCALE_MODE,
+  GCP_TENANT_ACCOUNT,
+  GCP_TENANT
 } from "utils/constants";
 import { readFileAsText } from "utils/files";
 import { SPACING_2 } from "utils/layouts";
@@ -85,6 +88,7 @@ const getCloudType = (connectionType) =>
     [AZURE_TENANT_ACCOUNT]: AZURE_TENANT,
     [ALIBABA_ACCOUNT]: ALIBABA_CNR,
     [GCP_ACCOUNT]: GCP_CNR,
+    [GCP_TENANT_ACCOUNT]: GCP_TENANT,
     [NEBIUS_ACCOUNT]: NEBIUS,
     [DATABRICKS_ACCOUNT]: DATABRICKS,
     [KUBERNETES]: KUBERNETES_CNR
@@ -189,6 +193,22 @@ const getGoogleParameters = async (formData) => {
   };
 };
 
+const getGoogleTenantParameters = async (formData) => {
+  const credentials = await readFileAsText(formData[GCP_TENANT_CREDENTIALS_FIELD_NAMES.CREDENTIALS]);
+
+  return {
+    name: formData[DATA_SOURCE_NAME_FIELD_NAME],
+    type: GCP_TENANT,
+    config: {
+      credentials: JSON.parse(credentials),
+      billing_data: {
+        dataset_name: formData[GCP_TENANT_CREDENTIALS_FIELD_NAMES.BILLING_DATA_DATASET],
+        table_name: formData[GCP_TENANT_CREDENTIALS_FIELD_NAMES.BILLING_DATA_TABLE]
+      }
+    }
+  };
+};
+
 const getNebiusParameters = (formData) => ({
   name: formData[DATA_SOURCE_NAME_FIELD_NAME],
   type: NEBIUS,
@@ -227,7 +247,7 @@ const renderConnectionTypeDescription = (settings) =>
     </Typography>
   ));
 
-const renderConnectionTypeInfoMessage = ({ connectionType }) =>
+const renderConnectionTypeInfoMessage = (connectionType) =>
   ({
     [AWS_ROOT_ACCOUNT]: renderConnectionTypeDescription([
       {
@@ -387,10 +407,29 @@ const renderConnectionTypeInfoMessage = ({ connectionType }) =>
           p: (chunks) => <p>{chunks}</p>
         }
       }
+    ]),
+    [GCP_TENANT_ACCOUNT]: renderConnectionTypeDescription([
+      {
+        key: "createGCPTenantDocumentationReference1",
+        messageId: "createGCPTenantDocumentationReference1"
+      },
+      {
+        key: "createGCPTenantDocumentationReference2",
+        messageId: "createGCPTenantDocumentationReference2",
+        values: {
+          link: (chunks) => (
+            <Link data-test-id="link_guide" href={DOCS_HYSTAX_CONNECT_GCP_CLOUD} target="_blank" rel="noopener">
+              {chunks}
+            </Link>
+          ),
+          strong: (chunks) => <strong>{chunks}</strong>,
+          p: (chunks) => <p>{chunks}</p>
+        }
+      }
     ])
   })[connectionType];
 
-const ConnectCloudAccountForm = ({ onSubmit, onCancel, isLoading, showCancel = true }) => {
+const ConnectCloudAccountForm = ({ onSubmit, onCancel, isLoading = false, showCancel = true }) => {
   const methods = useForm();
 
   const ref = useRef();
@@ -452,6 +491,13 @@ const ConnectCloudAccountForm = ({ onSubmit, onCancel, isLoading, showCancel = t
       dataTestId: "btn_gcp_account",
       action: () => defaultTileAction(GCP_ACCOUNT, GCP_CNR)
     },
+    {
+      id: GCP_TENANT_ACCOUNT,
+      icon: GcpLogoIcon,
+      messageId: GCP_TENANT_ACCOUNT,
+      dataTestId: "btn_gcp_tenant_account",
+      action: () => defaultTileAction(GCP_TENANT_ACCOUNT, GCP_TENANT)
+    },
     {
       id: ALIBABA_ACCOUNT,
       icon: AlibabaLogoIcon,
@@ -518,7 +564,7 @@ const ConnectCloudAccountForm = ({ onSubmit, onCancel, isLoading, showCancel = t
           ))}
         </div>
         <Box sx={{ width: { md: `max(50%, ${width}px)` } }}>
-          <Box sx={{ marginBottom: SPACING_2 }}>{renderConnectionTypeInfoMessage({ connectionType })}</Box>
+          <Box sx={{ marginBottom: SPACING_2 }}>{renderConnectionTypeInfoMessage(connectionType)}</Box>
           <form
             onSubmit={
               isDemo
@@ -531,6 +577,7 @@ const ConnectCloudAccountForm = ({ onSubmit, onCancel, isLoading, showCancel = t
                       [AZURE_TENANT]: getAzureTenantParameters,
                       [AZURE_CNR]: getAzureSubscriptionParameters,
                       [GCP_CNR]: getGoogleParameters,
+                      [GCP_TENANT]: getGoogleTenantParameters,
                       [ALIBABA_CNR]: getAlibabaParameters,
                       [NEBIUS]: getNebiusParameters,
                       [KUBERNETES_CNR]: getKubernetesParameters,
diff --git a/ngui/ui/src/components/forms/ConnectCloudAccountForm/FormElements/ConnectionFields.tsx b/ngui/ui/src/components/forms/ConnectCloudAccountForm/FormElements/ConnectionFields.tsx
index a76e7e9bf..6a44ed6e7 100644
--- a/ngui/ui/src/components/forms/ConnectCloudAccountForm/FormElements/ConnectionFields.tsx
+++ b/ngui/ui/src/components/forms/ConnectCloudAccountForm/FormElements/ConnectionFields.tsx
@@ -14,7 +14,8 @@ import {
   DatabricksCredentials,
   AwsRootBillingBucket,
   AwsRootExportType,
-  AwsRootUseAwsEdpDiscount
+  AwsRootUseAwsEdpDiscount,
+  GcpTenantCredentials
 } from "components/DataSourceCredentialFields";
 import { RadioGroup, Switch } from "components/forms/common/fields";
 import {
@@ -36,7 +37,8 @@ import {
   ALIBABA_ACCOUNT,
   GCP_ACCOUNT,
   NEBIUS_ACCOUNT,
-  DATABRICKS_ACCOUNT
+  DATABRICKS_ACCOUNT,
+  GCP_TENANT_ACCOUNT
 } from "utils/constants";
 
 export const AWS_ROOT_INPUTS_FIELD_NAMES = {
@@ -134,6 +136,8 @@ const ConnectionInputs = ({ connectionType }) => {
       return <AlibabaCredentials />;
     case GCP_ACCOUNT:
       return <GcpCredentials />;
+    case GCP_TENANT_ACCOUNT:
+      return <GcpTenantCredentials />;
     case NEBIUS_ACCOUNT:
       return <NebiusInputs />;
     case DATABRICKS_ACCOUNT:
diff --git a/ngui/ui/src/components/forms/DisconnectCloudAccountForm/DisconnectCloudAccountForm.tsx b/ngui/ui/src/components/forms/DisconnectCloudAccountForm/DisconnectCloudAccountForm.tsx
index 4348883b6..a0d7536c1 100644
--- a/ngui/ui/src/components/forms/DisconnectCloudAccountForm/DisconnectCloudAccountForm.tsx
+++ b/ngui/ui/src/components/forms/DisconnectCloudAccountForm/DisconnectCloudAccountForm.tsx
@@ -1,8 +1,10 @@
+import { Box } from "@mui/material";
 import { FormProvider, useForm } from "react-hook-form";
 import DeleteEntity from "components/DeleteEntity";
 import PageContentDescription from "components/PageContentDescription";
 import { useDataSources } from "hooks/useDataSources";
-import { AZURE_TENANT } from "utils/constants";
+import { AZURE_TENANT, GCP_TENANT } from "utils/constants";
+import { SPACING_1 } from "utils/layouts";
 import Survey from "./FormElements/Survey";
 import { DisconnectCloudAccountFormProps, FormValues } from "./types";
 import { getDefaultValues } from "./utils";
@@ -17,6 +19,7 @@ const DisconnectCloudAccountForm = ({
 }: DisconnectCloudAccountFormProps) => {
   const { disconnectQuestionId } = useDataSources(type);
   const isAzureTenant = type === AZURE_TENANT;
+  const isGcpTenant = type === GCP_TENANT;
 
   const methods = useForm<FormValues>({ defaultValues: getDefaultValues() });
   const { handleSubmit } = methods;
@@ -24,8 +27,8 @@ const DisconnectCloudAccountForm = ({
   return (
     <FormProvider {...methods}>
       <form data-test-id="disconnect-datasource-form" onSubmit={handleSubmit(onSubmit)} noValidate>
-        {(parentId || isAzureTenant) && (
-          <>
+        {(parentId || isAzureTenant || isGcpTenant) && (
+          <Box mb={SPACING_1}>
             {parentId && (
               <PageContentDescription
                 position="top"
@@ -34,15 +37,15 @@ const DisconnectCloudAccountForm = ({
                 }}
               />
             )}
-            {isAzureTenant && (
+            {isAzureTenant || isGcpTenant ? (
               <PageContentDescription
                 position="top"
                 alertProps={{
                   messageId: "parentDataSourceDisconnectionWarning"
                 }}
               />
-            )}
-          </>
+            ) : null}
+          </Box>
         )}
         <DeleteEntity
           message={{
diff --git a/ngui/ui/src/components/forms/UpdateDataSourceCredentialsForm/FormElements/CredentialInputs.tsx b/ngui/ui/src/components/forms/UpdateDataSourceCredentialsForm/FormElements/CredentialInputs.tsx
index def4dfe44..a3d5cdce6 100644
--- a/ngui/ui/src/components/forms/UpdateDataSourceCredentialsForm/FormElements/CredentialInputs.tsx
+++ b/ngui/ui/src/components/forms/UpdateDataSourceCredentialsForm/FormElements/CredentialInputs.tsx
@@ -17,7 +17,9 @@ import {
   AwsRootCredentials,
   AwsRootBillingBucket,
   AwsRootExportType,
-  AwsRootUseAwsEdpDiscount
+  AwsRootUseAwsEdpDiscount,
+  GcpTenantCredentials,
+  GCP_TENANT_CREDENTIALS_FIELD_NAMES
 } from "components/DataSourceCredentialFields";
 import { Switch } from "components/forms/common/fields";
 import {
@@ -27,7 +29,17 @@ import {
   ReportBucketPathPrefix
 } from "components/NebiusConfigFormElements";
 import UpdateServiceAccountCredentialsDescription from "components/NebiusConfigFormElements/UpdateServiceAccountCredentialsDescription";
-import { ALIBABA_CNR, AZURE_TENANT, AWS_CNR, AZURE_CNR, NEBIUS, GCP_CNR, DATABRICKS, KUBERNETES_CNR } from "utils/constants";
+import {
+  ALIBABA_CNR,
+  AZURE_TENANT,
+  AWS_CNR,
+  AZURE_CNR,
+  NEBIUS,
+  GCP_CNR,
+  DATABRICKS,
+  KUBERNETES_CNR,
+  GCP_TENANT
+} from "utils/constants";
 
 export const AWS_POOL_UPDATE_DATA_EXPORT_PARAMETERS = "updateDataExportParameters";
 
@@ -93,6 +105,15 @@ const CredentialInputs = ({ type, config }) => {
           ]}
         />
       );
+    case GCP_TENANT:
+      return (
+        <GcpTenantCredentials
+          hidden={[
+            GCP_TENANT_CREDENTIALS_FIELD_NAMES.BILLING_DATA_DATASET,
+            GCP_TENANT_CREDENTIALS_FIELD_NAMES.BILLING_DATA_TABLE
+          ]}
+        />
+      );
     case NEBIUS:
       return (
         <>
diff --git a/ngui/ui/src/components/forms/UpdateDataSourceCredentialsForm/UpdateDataSourceCredentialsForm.tsx b/ngui/ui/src/components/forms/UpdateDataSourceCredentialsForm/UpdateDataSourceCredentialsForm.tsx
index 9439bc6f8..38f796d3a 100644
--- a/ngui/ui/src/components/forms/UpdateDataSourceCredentialsForm/UpdateDataSourceCredentialsForm.tsx
+++ b/ngui/ui/src/components/forms/UpdateDataSourceCredentialsForm/UpdateDataSourceCredentialsForm.tsx
@@ -8,6 +8,7 @@ import {
   ALIBABA_CREDENTIALS_FIELD_NAMES,
   AZURE_SUBSCRIPTION_CREDENTIALS_FIELD_NAMES,
   GCP_CREDENTIALS_FIELD_NAMES,
+  GCP_TENANT_CREDENTIALS_FIELD_NAMES,
   DATABRICKS_CREDENTIALS_FIELD_NAMES,
   KUBERNETES_CREDENTIALS_FIELD_NAMES,
   AWS_LINKED_CREDENTIALS_FIELD_NAMES,
@@ -39,7 +40,8 @@ import {
   GCP_CNR,
   DATABRICKS,
   KUBERNETES_CNR,
-  AWS_ROOT_CONNECT_CUR_VERSION
+  AWS_ROOT_CONNECT_CUR_VERSION,
+  GCP_TENANT
 } from "utils/constants";
 import { readFileAsText } from "utils/files";
 import { CredentialInputs } from "./FormElements";
@@ -222,6 +224,8 @@ const UpdateCredentialsWarning = ({ type }) => {
       );
     case GCP_CNR:
       return renderUpdateWarning();
+    case GCP_TENANT:
+      return renderUpdateWarning();
     case NEBIUS:
       return renderUpdateWarning();
     default:
@@ -379,6 +383,29 @@ const getConfig = (type, config) => {
           };
         }
       };
+    case GCP_TENANT:
+      return {
+        getDefaultFormValues: () => ({
+          [GCP_TENANT_CREDENTIALS_FIELD_NAMES.BILLING_DATA_DATASET]: config.billing_data.dataset_name,
+          [GCP_TENANT_CREDENTIALS_FIELD_NAMES.BILLING_DATA_TABLE]: config.billing_data.table_name,
+          [GCP_TENANT_CREDENTIALS_FIELD_NAMES.CREDENTIALS]: ""
+        }),
+        parseFormDataToApiParams: async (formData) => {
+          // TODO: the form validates the file itself, not the content.
+          // Try to do both to avoid parsing the string here.
+          const credentials = await readFileAsText(formData[GCP_TENANT_CREDENTIALS_FIELD_NAMES.CREDENTIALS]);
+
+          return {
+            config: {
+              credentials: JSON.parse(credentials),
+              billing_data: {
+                dataset_name: formData[GCP_TENANT_CREDENTIALS_FIELD_NAMES.BILLING_DATA_DATASET],
+                table_name: formData[GCP_TENANT_CREDENTIALS_FIELD_NAMES.BILLING_DATA_TABLE]
+              }
+            }
+          };
+        }
+      };
     case NEBIUS:
       return {
         getDefaultFormValues: () => ({
diff --git a/ngui/ui/src/containers/ConnectCloudAccountContainer/ConnectCloudAccountContainer.tsx b/ngui/ui/src/containers/ConnectCloudAccountContainer/ConnectCloudAccountContainer.tsx
index dbb51d350..a2bbd7652 100644
--- a/ngui/ui/src/containers/ConnectCloudAccountContainer/ConnectCloudAccountContainer.tsx
+++ b/ngui/ui/src/containers/ConnectCloudAccountContainer/ConnectCloudAccountContainer.tsx
@@ -7,7 +7,17 @@ import { useOrganizationInfo } from "hooks/useOrganizationInfo";
 import { useRefetchApis } from "hooks/useRefetchApis";
 import { CLOUD_ACCOUNTS } from "urls";
 import { trackEvent, GA_EVENT_CATEGORIES } from "utils/analytics";
-import { ALIBABA_CNR, AWS_CNR, AZURE_CNR, AZURE_TENANT, DATABRICKS, GCP_CNR, KUBERNETES_CNR, NEBIUS } from "utils/constants";
+import {
+  ALIBABA_CNR,
+  AWS_CNR,
+  AZURE_CNR,
+  AZURE_TENANT,
+  DATABRICKS,
+  GCP_CNR,
+  GCP_TENANT,
+  KUBERNETES_CNR,
+  NEBIUS
+} from "utils/constants";
 
 const ConnectCloudAccountContainer = () => {
   const { organizationId } = useOrganizationInfo();
@@ -26,6 +36,7 @@ const ConnectCloudAccountContainer = () => {
       [AZURE_TENANT]: "azureTenantConfig",
       [AZURE_CNR]: "azureSubscriptionConfig",
       [GCP_CNR]: "gcpConfig",
+      [GCP_TENANT]: "gcpTenantConfig",
       [ALIBABA_CNR]: "alibabaConfig",
       [NEBIUS]: "nebiusConfig",
       [DATABRICKS]: "databricksConfig",
diff --git a/ngui/ui/src/containers/UpdateDataSourceCredentialsContainer/UpdateDataSourceCredentialsContainer.tsx b/ngui/ui/src/containers/UpdateDataSourceCredentialsContainer/UpdateDataSourceCredentialsContainer.tsx
index 602a8b5fe..7c67ac13b 100644
--- a/ngui/ui/src/containers/UpdateDataSourceCredentialsContainer/UpdateDataSourceCredentialsContainer.tsx
+++ b/ngui/ui/src/containers/UpdateDataSourceCredentialsContainer/UpdateDataSourceCredentialsContainer.tsx
@@ -3,7 +3,17 @@ import { GET_AVAILABLE_FILTERS } from "api/restapi/actionTypes";
 import UpdateDataSourceCredentialsForm from "components/forms/UpdateDataSourceCredentialsForm";
 import { UPDATE_DATA_SOURCE } from "graphql/api/restapi/queries/restapi.queries";
 import { useRefetchApis } from "hooks/useRefetchApis";
-import { ALIBABA_CNR, AWS_CNR, AZURE_CNR, AZURE_TENANT, DATABRICKS, GCP_CNR, KUBERNETES_CNR, NEBIUS } from "utils/constants";
+import {
+  ALIBABA_CNR,
+  AWS_CNR,
+  AZURE_CNR,
+  AZURE_TENANT,
+  DATABRICKS,
+  GCP_CNR,
+  GCP_TENANT,
+  KUBERNETES_CNR,
+  NEBIUS
+} from "utils/constants";
 
 const UpdateDataSourceCredentialsContainer = ({ id, type, config, closeSideModal }) => {
   const refetch = useRefetchApis();
@@ -16,6 +26,7 @@ const UpdateDataSourceCredentialsContainer = ({ id, type, config, closeSideModal
       [AZURE_TENANT]: "azureTenantConfig",
       [AZURE_CNR]: "azureSubscriptionConfig",
       [GCP_CNR]: "gcpConfig",
+      [GCP_TENANT]: "gcpTenantConfig",
       [ALIBABA_CNR]: "alibabaConfig",
       [NEBIUS]: "nebiusConfig",
       [DATABRICKS]: "databricksConfig",
diff --git a/ngui/ui/src/graphql/api/restapi/queries/restapi.queries.ts b/ngui/ui/src/graphql/api/restapi/queries/restapi.queries.ts
index 8316d0302..d38821136 100644
--- a/ngui/ui/src/graphql/api/restapi/queries/restapi.queries.ts
+++ b/ngui/ui/src/graphql/api/restapi/queries/restapi.queries.ts
@@ -48,6 +48,18 @@ const GcpDataSourceConfigFragment = gql`
   }
 `;
 
+const GcpTenantDataSourceConfigFragment = gql`
+  fragment GcpTenantDataSourceConfigFragment on GcpTenantDataSource {
+    config {
+      billing_data {
+        dataset_name
+        table_name
+        project_id
+      }
+    }
+  }
+`;
+
 const AlibabaDataSourceConfigFragment = gql`
   fragment AlibabaDataSourceConfigFragment on AlibabaDataSource {
     config {
@@ -161,6 +173,7 @@ const GET_DATA_SOURCES = gql`
       ...AzureTenantDataSourceConfigFragment
       ...AzureSubscriptionDataSourceConfigFragment
       ...GcpDataSourceConfigFragment
+      ...GcpTenantDataSourceConfigFragment
       ...AlibabaDataSourceConfigFragment
       ...NebiusDataSourceConfigFragment
       ...DatabricksDataSourceConfigFragment
@@ -171,6 +184,7 @@ const GET_DATA_SOURCES = gql`
   ${AzureTenantDataSourceConfigFragment}
   ${AzureSubscriptionDataSourceConfigFragment}
   ${GcpDataSourceConfigFragment}
+  ${GcpTenantDataSourceConfigFragment}
   ${AlibabaDataSourceConfigFragment}
   ${NebiusDataSourceConfigFragment}
   ${DatabricksDataSourceConfigFragment}
@@ -213,6 +227,7 @@ const GET_DATA_SOURCE = gql`
       ...AzureTenantDataSourceConfigFragment
       ...AzureSubscriptionDataSourceConfigFragment
       ...GcpDataSourceConfigFragment
+      ...GcpTenantDataSourceConfigFragment
       ...AlibabaDataSourceConfigFragment
       ...NebiusDataSourceConfigFragment
       ...DatabricksDataSourceConfigFragment
@@ -223,6 +238,7 @@ const GET_DATA_SOURCE = gql`
   ${AzureTenantDataSourceConfigFragment}
   ${AzureSubscriptionDataSourceConfigFragment}
   ${GcpDataSourceConfigFragment}
+  ${GcpTenantDataSourceConfigFragment}
   ${AlibabaDataSourceConfigFragment}
   ${NebiusDataSourceConfigFragment}
   ${DatabricksDataSourceConfigFragment}
@@ -239,6 +255,7 @@ const GET_INVITATIONS = gql`
       invite_assignments {
         id
         scope_id
+        scope_name
         scope_type
         purpose
       }
diff --git a/ngui/ui/src/hooks/useDataSources.ts b/ngui/ui/src/hooks/useDataSources.ts
index fc90b167d..0df8e27ea 100644
--- a/ngui/ui/src/hooks/useDataSources.ts
+++ b/ngui/ui/src/hooks/useDataSources.ts
@@ -23,7 +23,8 @@ import {
   ENVIRONMENT,
   GCP_CNR,
   CLOUD_ACCOUNT_TYPE,
-  NEBIUS
+  NEBIUS,
+  GCP_TENANT
 } from "utils/constants";
 
 export const getSettings = (type) =>
@@ -49,7 +50,7 @@ export const getSettings = (type) =>
     [DATABRICKS]: {
       icon: DatabricksLogoIcon,
       logo: databricksLogo,
-      disconnectQuestionId: "disconnectAzureQuestion",
+      disconnectQuestionId: "disconnectDatabricksQuestion",
       cloudTypeMessageId: CLOUD_ACCOUNT_TYPE[DATABRICKS]
     },
     [KUBERNETES_CNR]: {
@@ -74,6 +75,12 @@ export const getSettings = (type) =>
       disconnectQuestionId: "disconnectGcpQuestion",
       cloudTypeMessageId: CLOUD_ACCOUNT_TYPE[GCP_CNR]
     },
+    [GCP_TENANT]: {
+      icon: GcpLogoIcon,
+      logo: gcpLogo,
+      disconnectQuestionId: "disconnectGcpQuestion",
+      cloudTypeMessageId: CLOUD_ACCOUNT_TYPE[GCP_TENANT]
+    },
     [NEBIUS]: {
       icon: NebiusLogoIcon,
       logo: nebiusLogo,
diff --git a/ngui/ui/src/translations/en-US/app.json b/ngui/ui/src/translations/en-US/app.json
index 697e8947e..2277cd209 100644
--- a/ngui/ui/src/translations/en-US/app.json
+++ b/ngui/ui/src/translations/en-US/app.json
@@ -399,6 +399,8 @@
   "createDatabricksDocumentationReference": "Please provide programmatic credentials for a service principal with an account admin role. <link>Read this guide</link> for more details.",
   "createEnvironmentsBackdropMessage": "Please add an Shared Environment to track its usage for testing and development purposes.",
   "createGCPDocumentationReference": "Please provide a service account credentials JSON file with a ReadOnlyAccess permission attached. <link>Read this guide</link> for more details.",
+  "createGCPTenantDocumentationReference1": "Google Cloud tenant is a logical construct used to manage multiple cloud accounts and projects under a shared service account within Google Cloud Platform. Configuring a tenant requires assigning appropriate roles and permissions to the service account (e.g., sa1-service@…) across projects, enabling access to resources such as billing datasets and project-specific data. This setup facilitates the automatic detection of project_ids and integration with GCP data sources, ensuring consistent access control across projects.",
+  "createGCPTenantDocumentationReference2": "Please provide a service account credentials JSON file with a ReadOnlyAccess permission attached. <link>Read this guide</link> for more details.",
   "createKubernetesDocumentationReference1": "To get cost management and FinOps capabilities for your Kubernetes cluster, you need to deploy a piece of software that collects information about running pods and converts them into cost metrics. Refer to <link>this guide</link> for more details.",
   "createKubernetesDocumentationReference2": "The software is open-source, free of malware, and requires read-only access to Kubernetes metadata and performance metrics.",
   "createKubernetesDocumentationReference3": "Please review the code and find a detailed description at {kubernetesConnectGuide}.",
@@ -584,6 +586,7 @@
   "disconnectAlibabaQuestion": "Are you sure you want to disconnect this Alibaba data source?",
   "disconnectAzureQuestion": "Are you sure you want to disconnect this Azure data source?",
   "disconnectCalendar": "Disconnect calendar",
+  "disconnectDatabricksQuestion": "Are you sure you want to disconnect this Databricks data source?",
   "disconnectGcpQuestion": "Are you sure you want to disconnect this GCP data source?",
   "disconnectGoogleCalendarMessage": "OptScale will drop the connection with the calendar {link}. Shared Environments bookings will no longer be in sync with the calendar.",
   "disconnectGoogleCalendarTitle": "Disconnect Google Calendar",
@@ -809,6 +812,7 @@
   "fullName": "Full name",
   "garbageCollector": "Garbage Collector",
   "gcp": "Google Cloud",
+  "gcpTenant": "Google Cloud tenant",
   "general": "General",
   "generateLink": "Generate public link",
   "generateReport": "Generate report",
diff --git a/ngui/ui/src/utils/constants.ts b/ngui/ui/src/utils/constants.ts
index a0c3d4c7f..2254d05fb 100644
--- a/ngui/ui/src/utils/constants.ts
+++ b/ngui/ui/src/utils/constants.ts
@@ -54,6 +54,7 @@ export const AZURE_CNR = "azure_cnr";
 export const AZURE_TENANT = "azure_tenant";
 export const DATABRICKS = "databricks";
 export const GCP_CNR = "gcp_cnr";
+export const GCP_TENANT = "gcp_tenant";
 export const ALIBABA_CNR = "alibaba_cnr";
 export const NEBIUS = "nebius";
 export const KUBERNETES_CNR = "kubernetes_cnr";
@@ -67,6 +68,7 @@ export const DATABRICKS_ACCOUNT = "databricks";
 export const KUBERNETES = "kubernetes";
 export const ALIBABA_ACCOUNT = "alibaba";
 export const GCP_ACCOUNT = "gcp";
+export const GCP_TENANT_ACCOUNT = "gcpTenant";
 export const NEBIUS_ACCOUNT = "nebius";
 
 export const DATASOURCE_TYPE = "type";
@@ -80,6 +82,7 @@ export const CLOUD_ACCOUNT_TYPE = Object.freeze({
   [DATABRICKS]: "databricks",
   [ALIBABA_CNR]: "alibaba",
   [GCP_CNR]: "gcp",
+  [GCP_TENANT]: "gcpTenant",
   [ENVIRONMENT]: "environment",
   [NEBIUS]: "nebius",
   [KUBERNETES_CNR]: "kubernetes"
diff --git a/rest_api/rest_api_server/alembic/versions/a8dfe40f34a8_gcp_tenant.py b/rest_api/rest_api_server/alembic/versions/a8dfe40f34a8_gcp_tenant.py
new file mode 100644
index 000000000..35792efcb
--- /dev/null
+++ b/rest_api/rest_api_server/alembic/versions/a8dfe40f34a8_gcp_tenant.py
@@ -0,0 +1,37 @@
+"""gcp_tenant
+
+Revision ID: a8dfe40f34a8
+Revises: a1d0494e9815
+Create Date: 2024-12-05 06:58:44.080681
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision = 'a8dfe40f34a8'
+down_revision = 'a1d0494e9815'
+branch_labels = None
+depends_on = None
+
+old_cloud_types = sa.Enum('AWS_CNR', 'ALIBABA_CNR', 'AZURE_CNR', 'AZURE_TENANT',
+                          'KUBERNETES_CNR', 'ENVIRONMENT', 'GCP_CNR', 'NEBIUS',
+                          'DATABRICKS')
+new_cloud_types = sa.Enum('AWS_CNR', 'ALIBABA_CNR', 'AZURE_CNR', 'AZURE_TENANT',
+                          'KUBERNETES_CNR', 'ENVIRONMENT', 'GCP_CNR',
+                          'GCP_TENANT', 'NEBIUS', 'DATABRICKS')
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('cloudaccount', 'type', existing_type=old_cloud_types,
+                    type_=new_cloud_types, nullable=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('cloudaccount', 'type', existing_type=new_cloud_types,
+                    type_=old_cloud_types, nullable=False)
+    # ### end Alembic commands ###
diff --git a/rest_api/rest_api_server/controllers/cloud_account.py b/rest_api/rest_api_server/controllers/cloud_account.py
index ee33958db..f6f85b29c 100644
--- a/rest_api/rest_api_server/controllers/cloud_account.py
+++ b/rest_api/rest_api_server/controllers/cloud_account.py
@@ -285,7 +285,6 @@ def _get_non_linked_org_aws_accounts(self, org_id):
         return result
 
     def create(self, **kwargs):
-        LOG.info('Creating cloud account. Input data: %s', kwargs)
         org_id = kwargs.get('organization_id')
         self._check_organization(org_id)
         root_config = kwargs.pop('root_config', None)
@@ -311,9 +310,10 @@ def create(self, **kwargs):
             adapter_cls, config)
         if last_import_modified_at:
             kwargs['last_import_modified_at'] = last_import_modified_at
+        LOG.info('Creating cloud account. Input data: %s', kwargs)
         ca_obj = CloudAccount(**kwargs)
         self._validate(ca_obj, True, **kwargs)
-        if ca_obj.type == CloudTypes.AZURE_TENANT:
+        if ca_obj.type in [CloudTypes.AZURE_TENANT, CloudTypes.GCP_TENANT]:
             ca_obj.auto_import = False
         configuration_res = self._configure_report(
             adapter_cls, config, organization)
@@ -462,7 +462,6 @@ def _need_notification(kwargs):
         return bool(set(kwargs.keys()).intersection(set(NOTIFY_FIELDS)))
 
     def edit(self, item_id, **kwargs):
-        LOG.info('Editing cloud account %s. Input: %s', item_id, kwargs)
         self.check_update_restrictions(**kwargs)
         cloud_acc_obj = self.get(item_id)
         self._validate(cloud_acc_obj, False, **kwargs)
@@ -480,6 +479,8 @@ def edit(self, item_id, **kwargs):
             self.session, self._config)
         old_config = cloud_acc_obj.decoded_config
         config = kwargs.pop('config', {})
+        LOG.info('Editing cloud account %s. Input: %s. Config: %s', item_id,
+                 kwargs, bool(config))
         if cloud_acc_obj.parent_id and config:
             raise WrongArgumentsException(Err.OE0211, ['config'])
         organization = OrganizationController(
@@ -762,6 +763,9 @@ def create_children_accounts(self, root_account):
                     **c_config)
                 if c_name in skipped_subscriptions:
                     skipped_subscriptions.pop(c_name, None)
+            except ConflictException:
+                if c_name in skipped_subscriptions:
+                    skipped_subscriptions.pop(c_name, None)
             except Exception as ex:
                 if c_name not in skipped_subscriptions:
                     # Add error reason to root config
diff --git a/rest_api/rest_api_server/controllers/resource_observer.py b/rest_api/rest_api_server/controllers/resource_observer.py
index 7f257049a..5340f9cea 100644
--- a/rest_api/rest_api_server/controllers/resource_observer.py
+++ b/rest_api/rest_api_server/controllers/resource_observer.py
@@ -84,7 +84,9 @@ def observe(self, organization_id):
                 Err.OE0002, [Organization.__name__, organization_id])
         cloud_accounts_map = {}
         for cloud_account in self._get_cloud_accounts(organization_id):
-            if cloud_account.type == CloudTypes.AZURE_TENANT:
+            if cloud_account.type in [
+                CloudTypes.AZURE_TENANT, CloudTypes.GCP_TENANT
+            ]:
                 try:
                     CloudAccountController(
                         self.session, self._config, self.token
diff --git a/rest_api/rest_api_server/handlers/v2/cloud_account.py b/rest_api/rest_api_server/handlers/v2/cloud_account.py
index fb3b78c5e..b9fbde4f3 100644
--- a/rest_api/rest_api_server/handlers/v2/cloud_account.py
+++ b/rest_api/rest_api_server/handlers/v2/cloud_account.py
@@ -59,7 +59,8 @@ async def post(self, **url_params):
                     type:
                         type: string
                         enum: [aws_cnr, azure_cnr, kubernetes_cnr, alibaba_cnr,
-                               azure_tenant, gcp_cnr, nebius, databricks]
+                               azure_tenant, gcp_cnr, nebius, databricks,
+                               gcp_tenant]
                         description: Cloud account type
                         example: aws_cnr
                     config:
@@ -200,7 +201,7 @@ async def get(self, organization_id):
                                         description: "cloud account type:
                                         ('aws_cnr','azure_cnr', 'kubernetes_cnr',
                                          'azure_tenant', 'alibaba_cnr', 'gcp_cnr',
-                                         'nebius', 'databricks')"}
+                                         'nebius', 'databricks', 'gcp_tenant')"}
                                     config:
                                         type: object
                                         description: |
@@ -352,7 +353,7 @@ async def get(self, id, **kwargs):
                             description: "cloud account type:
                             ('aws_cnr','azure_cnr', 'alibaba_cnr',
                              'azure_tenant', 'kubernetes_cnr', 'gcp_cnr',
-                             'nebius', 'databricks')"}
+                             'nebius', 'databricks', 'gcp_tenant')"}
                         config: {type: object,
                             description:
                             "Object with credentials to access cloud"}
diff --git a/rest_api/rest_api_server/models/enums.py b/rest_api/rest_api_server/models/enums.py
index ad7d9162d..a08b1cf82 100644
--- a/rest_api/rest_api_server/models/enums.py
+++ b/rest_api/rest_api_server/models/enums.py
@@ -9,6 +9,7 @@ class CloudTypes(enum.Enum):
     KUBERNETES_CNR = 'kubernetes_cnr'
     ENVIRONMENT = 'environment'
     GCP_CNR = 'gcp_cnr'
+    GCP_TENANT = 'gcp_tenant'
     NEBIUS = 'nebius'
     DATABRICKS = 'databricks'
 
diff --git a/rest_api/rest_api_server/tests/unittests/test_api_base.py b/rest_api/rest_api_server/tests/unittests/test_api_base.py
index 7f6a747ee..d0e387d29 100644
--- a/rest_api/rest_api_server/tests/unittests/test_api_base.py
+++ b/rest_api/rest_api_server/tests/unittests/test_api_base.py
@@ -270,6 +270,7 @@ def create_cloud_account(self, organization_id, config, account_id=None,
             'azure_cnr': 'azure.Azure',
             'gcp_cnr': 'gcp.Gcp',
             'nebius': 'nebius.Nebius',
+            'gcp_tenant': 'gcp_tenant.GcpTenant'
         }
         if not account_id:
             account_id = self.gen_id()
diff --git a/rest_api/rest_api_server/tests/unittests/test_cloud_accounts.py b/rest_api/rest_api_server/tests/unittests/test_cloud_accounts.py
index 4b3255d84..28d0237e2 100644
--- a/rest_api/rest_api_server/tests/unittests/test_cloud_accounts.py
+++ b/rest_api/rest_api_server/tests/unittests/test_cloud_accounts.py
@@ -2035,3 +2035,57 @@ def test_databricks_patch_config(self):
     def test_adapter_implemented(self):
         for t in list(CloudTypes):
             CloudAdapter.get_adapter({'type': t.value})
+
+    def test_gcp_tenant_workflow(self):
+        body = {
+            'name': 'gcp cloud_acc',
+            'type': 'gcp_tenant',
+            'config': {
+                'credentials': {
+                    "project_id": "hystax",
+                    "type": "service_account",
+                    "private_key_id": "redacted",
+                    "private_key": "redacted",
+                },
+                'billing_data': {
+                    'dataset_name': 'billing_data',
+                    'table_name': 'gcp_billing_export_v1',
+                },
+            }
+        }
+        code, parent_ca = self.create_cloud_account(self.org_id, body)
+        self.assertEqual(code, 201)
+        self.assertEqual(parent_ca['type'], body['type'])
+        self.assertDictEqual(parent_ca['config']['billing_data'], {
+            'dataset_name': 'billing_data',
+            'project_id': 'hystax',
+            'table_name': 'gcp_billing_export_v1'
+        })
+        patch('tools.cloud_adapter.clouds.gcp_tenant.GcpTenant'
+              '.get_children_configs',
+              return_value=[{
+                  'name': 'child 1',
+                  'config': {'project_id': 'project_1'},
+                  'type': 'gcp_cnr'
+              }]).start()
+        patch('tools.cloud_adapter.clouds.gcp.Gcp.validate_credentials',
+              return_value={'account_id': 'project_1', 'warnings': []}
+              ).start()
+        code, _ = self.client.observe_resources(self.org_id)
+        self.assertEqual(code, 204)
+        code, resp = self.client.cloud_account_list(self.org_id)
+        self.assertEqual(code, 200)
+        self.assertEqual(len(resp['cloud_accounts']), 2)
+
+        for c in resp['cloud_accounts']:
+            if c['id'] != parent_ca['id']:
+                child_ca_id = c['id']
+                self.assertEqual(c['type'], 'gcp_cnr')
+                self.assertDictEqual(c['config']['credentials'], {
+                    "type": "service_account",
+                    "private_key_id": "redacted",
+                    "private_key": "redacted",
+                })
+                ca_obj = self.get_cloud_account_object(child_ca_id)
+                conf = decode_config(ca_obj.config)
+                self.assertEqual(conf, {'project_id': 'project_1'})
diff --git a/tools/cloud_adapter/cloud.py b/tools/cloud_adapter/cloud.py
index 84e0c0c9a..2967f7874 100644
--- a/tools/cloud_adapter/cloud.py
+++ b/tools/cloud_adapter/cloud.py
@@ -7,6 +7,7 @@
 from tools.cloud_adapter.clouds.kubernetes import Kubernetes
 from tools.cloud_adapter.clouds.environment import Environment
 from tools.cloud_adapter.clouds.gcp import Gcp
+from tools.cloud_adapter.clouds.gcp_tenant import GcpTenant
 from tools.cloud_adapter.clouds.nebius import Nebius
 from tools.cloud_adapter.clouds.databricks import Databricks
 
@@ -19,6 +20,7 @@
     'alibaba_cnr': Alibaba,
     'environment': Environment,
     'gcp_cnr': Gcp,
+    'gcp_tenant': GcpTenant,
     'nebius': Nebius,
     'databricks': Databricks
 }
diff --git a/tools/cloud_adapter/clouds/gcp.py b/tools/cloud_adapter/clouds/gcp.py
index 3f78746a1..71ece6153 100644
--- a/tools/cloud_adapter/clouds/gcp.py
+++ b/tools/cloud_adapter/clouds/gcp.py
@@ -1,7 +1,7 @@
 from collections import defaultdict
 from functools import cached_property
 from concurrent.futures import ThreadPoolExecutor
-import datetime
+from datetime import datetime, timezone, timedelta
 import hashlib
 import logging
 
@@ -27,6 +27,7 @@
 
 # can be from 0 to 500 for gcp API
 MAX_RESULTS = 500
+BILLING_THRESHOLD = 3
 
 # Retries logic composed of code from
 # google/cloud/bigquery/retry.py and
@@ -189,7 +190,7 @@ def _extract_tags(self):
     @staticmethod
     def _gcp_date_to_timestamp(date):
         return int(
-            datetime.datetime.strptime(date, "%Y-%m-%dT%H:%M:%S.%f%z").timestamp()
+            datetime.strptime(date, "%Y-%m-%dT%H:%M:%S.%f%z").timestamp()
         )
 
     @staticmethod
@@ -769,8 +770,21 @@ def metrics_client(self):
     def _billing_table_full_name(self):
         return f"{self.billing_project_id}.{self.billing_dataset}.{self.billing_table}"
 
+    @staticmethod
+    def _get_billing_threshold_date():
+        # billing threshold means datasets should be updated at least 3 days ago
+        return datetime.now(tz=timezone.utc).replace(
+            hour=0, minute=0, second=0, microsecond=0
+        ) - timedelta(days=BILLING_THRESHOLD)
+
     def _test_bigquery_connection(self):
-        query = f"select currency from `{self._billing_table_full_name()}` limit 1"
+        dt = self._get_billing_threshold_date()
+        query = f"""
+            SELECT currency
+            FROM `{self._billing_table_full_name()}`
+            WHERE TIMESTAMP_TRUNC(_PARTITIONTIME, DAY) >= TIMESTAMP("{dt}")
+            LIMIT 1
+        """
         query_job = self.bigquery_client.query(query, **DEFAULT_KWARGS)
         result = list(query_job.result())[0]
         if not result or dict(result).get("currency") != self._currency:
@@ -844,8 +858,7 @@ def get_usage(self, start_date, end_date):
             credits, adjustment_info
         FROM `{table_name}`
         WHERE
-            usage_start_time >= TIMESTAMP("{start_date}") AND
-            usage_end_time <= TIMESTAMP("{end_date}") AND
+            TIMESTAMP_TRUNC(_PARTITIONTIME, DAY) = TIMESTAMP("{start_date}") AND
             project.id = "{self.project_id}"
         """
         return self.bigquery_client.query(
@@ -1182,18 +1195,21 @@ def _build_pricing_query(self, sku_desription_pattern: str) -> str:
         #             GROUP BY sku.id) inr
         # ON    prices.sku.id = inr.sku_id
         #   AND prices.export_time = inr.export_time
+        dt = self._get_billing_threshold_date()
         inner_query = f"""
-        SELECT sku.id as sku_id, max(export_time) as export_time
-        FROM `{self._pricing_table_full_name()}`
-        WHERE service.id = '{COMPUTE_SERVICE_ID}'
-            AND sku.description LIKE '{sku_desription_pattern}'
-        GROUP BY sku.id"""
+            SELECT sku.id as sku_id, max(export_time) as export_time
+            FROM `{self._pricing_table_full_name()}`
+            WHERE service.id = '{COMPUTE_SERVICE_ID}'
+                AND sku.description LIKE '{sku_desription_pattern}'
+                AND TIMESTAMP_TRUNC(_PARTITIONTIME, DAY) >= TIMESTAMP("{dt}")
+            GROUP BY sku.id"""
         query = f"""
-        SELECT prices.list_price, prices.sku
-        FROM `{self._pricing_table_full_name()}` prices
-        INNER JOIN ({inner_query}) inr
-        ON    prices.sku.id = inr.sku_id
-          AND prices.export_time = inr.export_time
+            SELECT prices.list_price, prices.sku
+            FROM `{self._pricing_table_full_name()}` prices
+            INNER JOIN ({inner_query}) inr
+                ON prices.sku.id = inr.sku_id
+                AND prices.export_time = inr.export_time
+            WHERE TIMESTAMP_TRUNC(_PARTITIONTIME, DAY) >= TIMESTAMP("{dt}")
         """
         return query
 
diff --git a/tools/cloud_adapter/clouds/gcp_tenant.py b/tools/cloud_adapter/clouds/gcp_tenant.py
new file mode 100644
index 000000000..73befba4b
--- /dev/null
+++ b/tools/cloud_adapter/clouds/gcp_tenant.py
@@ -0,0 +1,102 @@
+from functools import cached_property
+from tools.cloud_adapter.clouds.gcp import Gcp, DEFAULT_KWARGS
+from tools.cloud_adapter.enums import CloudTypes
+from tools.cloud_adapter.utils import CloudParameter
+from tools.cloud_adapter.exceptions import (
+    InvalidParameterException, CloudConnectionError)
+from google.cloud import bigquery
+from google.api_core import exceptions as api_exceptions
+
+
+class GcpTenant(Gcp):
+    BILLING_CREDS = [
+        CloudParameter(
+            name="billing_data",
+            type=dict,
+            required=True,
+            dependencies=[
+                CloudParameter(name="project_id", type=str, required=False),
+                CloudParameter(name="dataset_name", type=str, required=True),
+                CloudParameter(name="table_name", type=str, required=True),
+            ],
+        ),
+        CloudParameter(
+            name="pricing_data",
+            type=dict,
+            required=False,
+            dependencies=[
+                CloudParameter(name="project_id", type=str, required=False),
+                CloudParameter(name="dataset_name", type=str, required=True),
+                CloudParameter(name="table_name", type=str, required=True),
+            ],
+        ),
+        CloudParameter(name="credentials", type=dict, required=True, protected=True),
+
+        # Service parameters
+        CloudParameter(name='skipped_subscriptions', type=dict, required=False)
+    ]
+
+    @classmethod
+    def configure_credentials(cls, config):
+        project_id = config['credentials'].pop('project_id', None)
+        if project_id:
+            for k in ['billing_data', 'pricing_data']:
+                dataset = config.get(k)
+                if dataset and not dataset.get('project_id'):
+                    config[k]['project_id'] = project_id
+        return config
+
+    @cached_property
+    def bigquery_client(self):
+        return bigquery.Client.from_service_account_info(
+            self.credentials,
+            project=self.billing_project_id,
+        )
+
+    def _test_bigquery_connection(self):
+        self._list_projects()
+
+    def discovery_calls_map(self):
+        return {}
+
+    def validate_credentials(self, org_id=None):
+        try:
+            self._validate_billing_config()
+            self._validate_billing_type()
+            self._test_bigquery_connection()
+        except api_exceptions.Forbidden as ex:
+            # remove new-lines, otherwise tornado will fail to write response
+            raise InvalidParameterException(str(ex).replace("\n", " "))
+        except Exception as ex:
+            raise CloudConnectionError(str(ex))
+        return {"account_id": self.config.get("client_id"), "warnings": []}
+
+    def _list_projects(self):
+        dt = self._get_billing_threshold_date()
+        # find actual project name from latest dataset update
+        query = f"""
+            SELECT project.id, project.name, max(export_time)
+            FROM `{self._billing_table_full_name()}`
+            WHERE TIMESTAMP_TRUNC(_PARTITIONTIME, DAY) >= TIMESTAMP("{dt}")
+            GROUP BY project.id, project.name
+            """
+        query_job = self.bigquery_client.query(query, **DEFAULT_KWARGS)
+        names_map = {}
+        for r in list(query_job.result()):
+            project_id, name, dt = r
+            if not project_id or (
+                project_id in names_map and names_map[project_id][1] > dt
+            ):
+                continue
+            names_map[project_id] = (name, dt)
+        return {k: v[0] for k, v in names_map.items()}
+
+    def get_children_configs(self):
+        projects = self._list_projects()
+        return [{
+            'name': project_name,
+            'config': {
+                'project_id': project_id
+            },
+            'type': CloudTypes.GCP_CNR.value
+        } for project_id, project_name in projects.items()]
diff --git a/tools/cloud_adapter/enums.py b/tools/cloud_adapter/enums.py
index 426171b09..349802929 100644
--- a/tools/cloud_adapter/enums.py
+++ b/tools/cloud_adapter/enums.py
@@ -8,6 +8,7 @@ class CloudTypes(Enum):
     AZURE_TENANT = 'azure_tenant'
     KUBERNETES_CNR = 'kubernetes_cnr'
     GCP_CNR = 'gcp_cnr'
+    GCP_TENANT = 'gcp_tenant'
     NEBIUS = 'nebius'
     ENVIRONMENT = 'environment'
     DATABRICKS = 'databricks'