diff --git a/charts/aoi/README.md b/charts/aoi/README.md
index 5068691..f825e54 100644
--- a/charts/aoi/README.md
+++ b/charts/aoi/README.md
@@ -18,7 +18,7 @@ A Helm chart for Netic application operations infrastructure
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | alerting.clusterId | string | `""` | Value of the label (cluster_id) |
-| alerting.clusterWideNamespace.bootstrapConfig | object | `{"externalSecretsStore":{},"git":{"github":{},"gitlab":{}},"vault":{}}` | overwrite options configured in global.bootstrapConfig |
+| alerting.clusterWideNamespace.bootstrapConfig | object | `{"externalSecretsStore":{},"git":{"bitbucket":{},"github":{},"gitlab":{}},"vault":{}}` | overwrite options configured in global.bootstrapConfig |
 | alerting.clusterWideNamespace.bootstrapConfig.externalSecretsStore | object | `{}` | overwrite externalSecretStore options, make sure to include all options in overwrite, it is not merged with globally defined options. |
 | alerting.clusterWideNamespace.bootstrapConfig.git.github | object | `{}` | overwrite git options, make sure to include all options in overwrite, it is not merged with globally defined options. |
 | alerting.clusterWideNamespace.bootstrapConfig.vault | object | `{}` | overwrite vault options, make sure to include all options in overwrite, it is not merged with globally defined options. |
@@ -57,7 +57,7 @@ A Helm chart for Netic application operations infrastructure
 | authProxy.terminationGracePeriodSeconds | int | `30` |  |
 | authProxy.tolerations | list | `[]` |  |
 | authProxy.topologySpauthProxyConstraints | list | `[]` |  |
-| dashboards.bootstrapConfig | object | `{"externalSecretsStore":{},"git":{"github":{},"gitlab":{}},"vault":{}}` | overwrite options configured in global.bootstrapConfig |
+| dashboards.bootstrapConfig | object | `{"externalSecretsStore":{},"git":{"bitbucket":{},"github":{},"gitlab":{}},"vault":{}}` | overwrite options configured in global.bootstrapConfig |
 | dashboards.bootstrapConfig.externalSecretsStore | object | `{}` | overwrite externalSecretStore options, make sure to include all options in overwrite, it is not merged with globally defined options. |
 | dashboards.bootstrapConfig.git.github | object | `{}` | overwrite git options, make sure to include all options in overwrite, it is not merged with globally defined options. |
 | dashboards.bootstrapConfig.vault | object | `{}` | overwrite vault options, make sure to include all options in overwrite, it is not merged with globally defined options. |
@@ -67,8 +67,8 @@ A Helm chart for Netic application operations infrastructure
 | externalSecret.vaultPath | string | `nil` |  |
 | externalSecret.vaultServer | string | `nil` |  |
 | global.annotations | object | `{}` |  |
-| global.bootstrapConfig | object | `{"externalSecretsStore":{},"git":{"flavor":"github","github":{},"gitlab":{}},"vault":{}}` | Options to configure the bootstrapConfig globally can be overwritten for dashboards and clusterWideNamespace alerting namespace. .Values.dashboards.bootstrapConfig .Values.alerting.clusterWideNamespace.bootstrapConfig |
-| global.bootstrapConfig.git.flavor | string | `"github"` | Which git flavor to use, currently only supports github and gitlab |
+| global.bootstrapConfig | object | `{"externalSecretsStore":{},"git":{"bitbucket":{},"flavor":"github","github":{},"gitlab":{}},"vault":{}}` | Options to configure the bootstrapConfig globally can be overwritten for dashboards and clusterWideNamespace alerting namespace. .Values.dashboards.bootstrapConfig .Values.alerting.clusterWideNamespace.bootstrapConfig |
+| global.bootstrapConfig.git.flavor | string | `"github"` | Which git flavor to use, currently only supports github, gitlab and bitbucket |
 | global.clusterDomain | string | `"cluster.local"` |  |
 | global.containerSecurityContext.allowPrivilegeEscalation | bool | `false` |  |
 | global.containerSecurityContext.capabilities.drop[0] | string | `"all"` |  |
@@ -92,7 +92,7 @@ A Helm chart for Netic application operations infrastructure
 | grafana.resources.requests.memory | string | `"256Mi"` |  |
 | grafana.sidecar.dashboards.enabled | bool | `true` |  |
 | grafana.sidecar.dashboards.folderAnnotation | string | `"grafana_dashboard_folder"` | override grafana folder using annotation |
-| grafana.sidecar.dashboards.label | string | `"aoi_dashboard"` | Load configmaps with label key |
+| grafana.sidecar.dashboards.label | string | `"application-operations-dashboards"` | Load configmaps with label key |
 | grafana.sidecar.dashboards.provider.disableDelete | bool | `true` |  |
 | grafana.sidecar.dashboards.provider.foldersFromFilesStructure | bool | `true` |  |
 | grafana.sidecar.dashboards.searchNamespace | list | `["application-operations-dashboards"]` | Watch for configmaps in namespaces |
diff --git a/charts/aoi/templates/application-operations-alerting/_helpers.tpl b/charts/aoi/templates/application-operations-alerting/_helpers.tpl
index 4b88862..1b2b3b9 100644
--- a/charts/aoi/templates/application-operations-alerting/_helpers.tpl
+++ b/charts/aoi/templates/application-operations-alerting/_helpers.tpl
@@ -75,8 +75,11 @@ git:
 {{- else if eq .Values.global.bootstrapConfig.git.flavor "gitlab" }}
   gitlab:
   {{- default .Values.global.bootstrapConfig.git.gitlab .Values.alerting.clusterWideNamespace.bootstrapConfig.git.gitlab | toYaml | nindent 4}}
+{{- else if eq .Values.global.bootstrapConfig.git.flavor "bitbucket" }}
+  bitbucket:
+  {{- default .Values.global.bootstrapConfig.git.bitbucket .Values.alerting.clusterWideNamespace.bootstrapConfig.git.bitbucket | toYaml | nindent 4}}
 {{- else }}
-{{ fail "Invalid git flavor. Supported git flavors (github,gitlab)" }}
+{{ fail "Invalid git flavor. Supported git flavors (github,gitlab,bitbucket)" }}
 {{- end }}
 vault:
 {{- default .Values.global.bootstrapConfig.vault .Values.alerting.clusterWideNamespace.bootstrapConfig.vault | toYaml | nindent 2}}
diff --git a/charts/aoi/templates/application-operations-dashboards/_helpers.tpl b/charts/aoi/templates/application-operations-dashboards/_helpers.tpl
index 827a144..9abc44c 100644
--- a/charts/aoi/templates/application-operations-dashboards/_helpers.tpl
+++ b/charts/aoi/templates/application-operations-dashboards/_helpers.tpl
@@ -9,8 +9,11 @@ git:
 {{- else if eq .Values.global.bootstrapConfig.git.flavor "gitlab" }}
   gitlab:
   {{- default .Values.global.bootstrapConfig.git.gitlab .Values.dashboards.bootstrapConfig.git.gitlab | toYaml | nindent 4}}
+{{- else if eq .Values.global.bootstrapConfig.git.flavor "bitbucket" }}
+  bitbucket:
+  {{- default .Values.global.bootstrapConfig.git.bitbucket .Values.dashboards.bootstrapConfig.git.bitbucket | toYaml | nindent 4}}
 {{- else }}
-{{ fail "Invalid git flavor. Supported git flavors (github,gitlab)" }}
+{{ fail "Invalid git flavor. Supported git flavors (github,gitlab,bitbucket)" }}
 {{- end }}
 vault:
 {{- default .Values.global.bootstrapConfig.vault .Values.dashboards.bootstrapConfig.vault | toYaml | nindent 2}}
diff --git a/charts/aoi/values.yaml b/charts/aoi/values.yaml
index 7ad6e42..2d0b0f9 100644
--- a/charts/aoi/values.yaml
+++ b/charts/aoi/values.yaml
@@ -26,10 +26,11 @@ global:
   # .Values.alerting.clusterWideNamespace.bootstrapConfig
   bootstrapConfig:
     git:
-      # -- Which git flavor to use, currently only supports github and gitlab
+      # -- Which git flavor to use, currently only supports github, gitlab and bitbucket
       flavor: "github"
       github: {}
       gitlab: {}
+      bitbucket: {}
     vault: {}
     externalSecretsStore: {}
 
@@ -42,6 +43,7 @@ dashboards:
       # -- overwrite git options, make sure to include all options in overwrite, it is not merged with globally defined options.
       github: {}
       gitlab: {}
+      bitbucket: {}
     # -- overwrite vault options, make sure to include all options in overwrite, it is not merged with globally defined options.
     vault: {}
     # -- overwrite externalSecretStore options, make sure to include all options in overwrite, it is not merged with globally defined options.
@@ -343,6 +345,7 @@ alerting:
         # -- overwrite git options, make sure to include all options in overwrite, it is not merged with globally defined options.
         github: {}
         gitlab: {}
+        bitbucket: {}
       # -- overwrite vault options, make sure to include all options in overwrite, it is not merged with globally defined options.
       vault: {}
       # -- overwrite externalSecretStore options, make sure to include all options in overwrite, it is not merged with globally defined options.