diff --git a/charts/theia-cloud/Chart.yaml b/charts/theia-cloud/Chart.yaml
index beab125..12d2d17 100644
--- a/charts/theia-cloud/Chart.yaml
+++ b/charts/theia-cloud/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.4.0-next.6
+version: 1.4.0-next.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/theia-cloud/templates/operator.yaml b/charts/theia-cloud/templates/operator.yaml
index 4da272a..bf7e817 100644
--- a/charts/theia-cloud/templates/operator.yaml
+++ b/charts/theia-cloud/templates/operator.yaml
@@ -97,21 +97,25 @@ spec:
           {{- if .Values.operator.continueOnException }}
           - "--continueOnException"
           {{- end }}
-          {{- if .Values.operator.enableBuildCaching }}
+          {{- if .Values.operator.buildCache.enabled }}
           - "--enableBuildCaching"
-          {{- if .Values.operator.buildCacheUrl }}
+          {{- if .Values.operator.buildCache.gradleUrl }}
           - "--buildCacheUrl"
-          - "{{ tpl (.Values.operator.buildCacheUrl | toString) . }}"
+          - "{{ tpl (.Values.operator.buildCache.gradleUrl | toString) . }}"
           {{- end }}
-          {{- if .Values.operator.enableBuildCachePush }}
+          {{- if .Values.operator.buildCache.bazelUrl }}
+          - "--bazelBuildCacheUrl"
+          - "{{ tpl (.Values.operator.buildCache.bazelUrl | toString) . }}"
+          {{- end }}
+          {{- if .Values.operator.buildCache.enablePush }}
           - "--enableBuildCachePush"
           {{- end }}
           {{- end }}
-          {{- if .Values.operator.enableDependencyCaching }}
+          {{- if .Values.operator.dependencyCache.enabled }}
           - "--enableDependencyCaching"
-          {{- if .Values.operator.dependencyCacheUrl }}
+          {{- if .Values.operator.dependencyCache.url }}
           - "--dependencyCacheUrl"
-          - "{{ tpl (.Values.operator.dependencyCacheUrl | toString) . }}"
+          - "{{ tpl (.Values.operator.dependencyCache.url | toString) . }}"
           {{- end }}
           {{- end }}
         {{- if .Values.operator.logging.override }}
diff --git a/charts/theia-cloud/values.yaml b/charts/theia-cloud/values.yaml
index 1bf5284..8be7557 100644
--- a/charts/theia-cloud/values.yaml
+++ b/charts/theia-cloud/values.yaml
@@ -327,20 +327,23 @@ operator:
   # -- Whether the operator should stop in cases where an exception is not handled
   continueOnException: false
 
-  # -- Whether to enable build caching
-  enableBuildCaching: false
-
-  # -- The URL of the remote build cache server. Only used when enableBuildCaching is true.
-  buildCacheUrl: ""
-
-  # -- Whether sessions are allowed to push to the build cache. Only used when enableBuildCaching is true.
-  enableBuildCachePush: false
-
-  # -- Whether to enable the dependency cache (Reposilite).
-  enableDependencyCaching: false
-
-  # -- The URL of the dependency cache server (Reposilite). Only used when enableDependencyCaching is true.
-  dependencyCacheUrl: ""
+  # -- Build cache configuration
+  buildCache:
+    # -- Whether to enable build caching
+    enabled: false
+    # -- The URL of the remote Gradle build cache server.
+    gradleUrl: ""
+    # -- The URL of the remote Bazel build cache server.
+    bazelUrl: ""
+    # -- Whether sessions are allowed to push to the build cache.
+    enablePush: false
+
+  # -- Dependency cache configuration (Reposilite)
+  dependencyCache:
+    # -- Whether to enable the dependency cache
+    enabled: false
+    # -- The URL of the dependency cache server.
+    url: ""
 
   # -- Allows to override the operator's log4j configuration
   # @default -- (see details below)