diff --git a/charts/airbyte/templates/airbyte-db.yaml b/charts/airbyte/templates/airbyte-db.yaml
index b8d57c1c79f..837d8444cf5 100644
--- a/charts/airbyte/templates/airbyte-db.yaml
+++ b/charts/airbyte/templates/airbyte-db.yaml
@@ -53,6 +53,8 @@ spec:
           volumeMounts:
             - name: airbyte-volume-db
               mountPath: /var/lib/postgresql/data
+          resources:
+            {{- toYaml .Values.postgresql.resources | nindent 12 }}    
   volumeClaimTemplates:
   - metadata:
       name: airbyte-volume-db
@@ -61,4 +63,4 @@ spec:
       resources:
         requests:
           storage: 500Mi
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/airbyte/templates/minio.yaml b/charts/airbyte/templates/minio.yaml
index f25068d4882..7b917a18375 100644
--- a/charts/airbyte/templates/minio.yaml
+++ b/charts/airbyte/templates/minio.yaml
@@ -48,6 +48,8 @@ spec:
           volumeMounts:
             - name: airbyte-minio-pv-claim # must match the volume name, above
               mountPath: "/data"
+          resources:
+            {{- toYaml .Values.minio.resources | nindent 12 }}
       {{- with .Values.minio.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml
index f842587350b..57af2649cda 100644
--- a/charts/airbyte/values.yaml
+++ b/charts/airbyte/values.yaml
@@ -1,3 +1,4 @@
+---
 ### TEST FOR RELEASE WORKFLOW
 
 ## @section Global Parameters
@@ -1248,6 +1249,8 @@ temporal:
 ##  postgresql.containerSecurityContext.runAsNonRoot Ensures the container will run with a non-root user
 ##  postgresql.commonAnnotations.helm.sh/hook It will determine when the hook should be rendered
 ##  postgresql.commonAnnotations.helm.sh/hook-weight The order in which the hooks are executed. If weight is lower, it has higher priority
+##  postgresql.resources.limits [object] The resources limits for postgresql
+##  postgresql.resources.requests [object] The requested resources for postgresql
 ##
 postgresql:
   enabled: true
@@ -1268,6 +1271,23 @@ postgresql:
   commonAnnotations:
     helm.sh/hook: pre-install,pre-upgrade
     helm.sh/hook-weight: "-1"
+
+  ## PostgreSQL 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:'.
+  ##  postgresql.resources.limits [object] The resources limits for postgresql
+  ##  postgresql.resources.requests [object] The requested resources for postgresql
+  resources: {}
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
 ## External PostgreSQL configuration
 ## All of these values are only used when postgresql.enabled is set to false
 ##  externalDatabase.host Database host
@@ -1289,11 +1309,14 @@ externalDatabase:
   port: 5432
   jdbcUrl: ""
 
+
 ## @section Logs parameters
 
 ## @section Minio chart overwrites
 ##  minio.accessKey.password Minio Access Key
 ##  minio.secretKey.password Minio Secret Key
+##  minio.resources.limits [object] The resources limits for minio
+##  minio.resources.requests [object] The requested resources for minio
 minio:
   enabled: true
 
@@ -1309,6 +1332,23 @@ minio:
   storage:
     volumeClaimValue: 500Mi
 
+
+  ## 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
+  ##  minio.resources.requests [object] The requested resources for minio
+  resources: {}
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
 ## @section cron parameters
 
 cron: