diff --git a/.gitignore b/.gitignore
index 77938eb2396..db1716e0497 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,9 @@ data
 **/gmon.out
 static_checker_reports/
 
+# ignore jenv artifacts
+.java-version
+
 # Logs
 acceptance_tests_logs/
 
diff --git a/charts/airbyte/README.md b/charts/airbyte/README.md
index 6a1334ee2b7..2b08302b029 100644
--- a/charts/airbyte/README.md
+++ b/charts/airbyte/README.md
@@ -278,6 +278,8 @@ Helm chart to deploy airbyte
 | minio.nodeSelector | object | `{}` | Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ # |
 | minio.storage.volumeClaimValue | string | `"500Mi"` |  |
 | minio.tolerations | list | `[]` | Tolerations for minio pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ # |
+| minio.resources.limits                                       | object | `{}`                                 | The resources limits for the minio container |
+| minio.resources.requests                                     | object | `{}`                                 | The requested resources for the minio container |
 | nameOverride | string | `""` | String to partially override airbyte.fullname template with a string (will prepend the release name) |
 | pod-sweeper.affinity | object | `{}` | Affinity and anti-affinity for pod assignment, see https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity |
 | pod-sweeper.containerSecurityContext.allowPrivilegeEscalation | bool | `false` |  |
diff --git a/charts/airbyte/templates/minio.yaml b/charts/airbyte/templates/minio.yaml
index 408ccb2e0f7..8e1223e2798 100644
--- a/charts/airbyte/templates/minio.yaml
+++ b/charts/airbyte/templates/minio.yaml
@@ -76,6 +76,9 @@ spec:
           volumeMounts:
             - name: airbyte-minio-pv-claim # must match the volume name, above
               mountPath: "/storage"
+          {{- if .Values.minio.resources }}
+          resources: {{- toYaml .Values.minio.resources | nindent 12 }}
+          {{- end }}
       {{- with .Values.minio.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml
index 1234394a017..221c6d101a6 100644
--- a/charts/airbyte/values.yaml
+++ b/charts/airbyte/values.yaml
@@ -1432,6 +1432,25 @@ minio:
   # -- Affinity and anti-affinity for minio pod assignment, see
   # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
   affinity: {}
+  ## Minio resource requests and limits
+  ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+  ## We usually recommend not to specify default resources and to leave this as a conscious
+  ## choice for the user. This also increases chances charts run on environments with little
+  ## resources, such as Minikube. If you do want to specify resources, uncomment the following
+  ## lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  ##  minio.resources.limits [object] The resources limits for minio pod(s)
+  ##  minio.resources.requests [object] The requested resources for minio pod(s)
+  resources:
+    ## Example:
+    ## requests:
+    ##    memory: 256Mi
+    ##    cpu: 250m
+    requests: {}
+    ## Example:
+    ## limits:
+    ##    cpu: 200m
+    ##    memory: 1Gi
+    limits:
 
 ## @section cron parameters