diff --git a/helm/alfresco-content-services/requirements.yaml b/helm/alfresco-content-services/requirements.yaml
index dc631b71be..c9adec13f6 100644
--- a/helm/alfresco-content-services/requirements.yaml
+++ b/helm/alfresco-content-services/requirements.yaml
@@ -7,4 +7,4 @@ dependencies:
 - name: nginx-ingress
   version: ^0.8.21
   repository: https://kubernetes-charts.storage.googleapis.com
-  condition: nginx-ingress.enabled
\ No newline at end of file
+  condition: alfresco-content-services.nginx-ingress.enabled
\ No newline at end of file
diff --git a/helm/alfresco-content-services/templates/deployment-repository.yaml b/helm/alfresco-content-services/templates/deployment-repository.yaml
index cdf6c64ae1..2fd87a2a1a 100644
--- a/helm/alfresco-content-services/templates/deployment-repository.yaml
+++ b/helm/alfresco-content-services/templates/deployment-repository.yaml
@@ -26,6 +26,8 @@ spec:
               name: {{ template "content-services.fullname" . }}-repository-configmap
           ports:
             - containerPort: {{ .Values.repository.image.internalPort }}
+          resources:
+{{ toYaml .Values.repository.resources | indent 12 }}
       initContainers:
         - name: init-postgres
           image: busybox
diff --git a/helm/alfresco-content-services/templates/deployment-share.yaml b/helm/alfresco-content-services/templates/deployment-share.yaml
index bdfb3ad7c8..6f268a30f4 100644
--- a/helm/alfresco-content-services/templates/deployment-share.yaml
+++ b/helm/alfresco-content-services/templates/deployment-share.yaml
@@ -23,6 +23,8 @@ spec:
           imagePullPolicy: {{ .Values.share.image.pullPolicy }}
           ports:
             - containerPort: {{ .Values.share.image.internalPort }}
+          resources:
+{{ toYaml .Values.share.resources | indent 12 }}
           envFrom:
           - configMapRef:
               name: {{ template "content-services.fullname" . }}-share-configmap
\ No newline at end of file
diff --git a/helm/alfresco-content-services/templates/deployment-solr.yaml b/helm/alfresco-content-services/templates/deployment-solr.yaml
index 197d9c812d..7a8901e9c2 100644
--- a/helm/alfresco-content-services/templates/deployment-solr.yaml
+++ b/helm/alfresco-content-services/templates/deployment-solr.yaml
@@ -25,4 +25,6 @@ spec:
           - configMapRef:
               name: {{ template "content-services.fullname" . }}-solr-configmap
           ports:
-            - containerPort: {{ .Values.solr.image.internalPort }}
\ No newline at end of file
+            - containerPort: {{ .Values.solr.image.internalPort }}
+          resources:
+{{ toYaml .Values.solr.resources | indent 12 }}
\ No newline at end of file
diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml
index e560fda250..8637c91f8e 100644
--- a/helm/alfresco-content-services/values.yaml
+++ b/helm/alfresco-content-services/values.yaml
@@ -21,6 +21,11 @@ repository:
     JAVA_OPTS: " -Dsolr.base.url=/solr
       -Dsolr.secureComms=none
       -Dindex.subsystem.name=solr6"
+  resources:
+    requests:
+      memory: "1000Mi"
+    limits:
+      memory: "4000Mi"
 
 share:
   replicaCount: 1
@@ -35,6 +40,11 @@ share:
     externalPort: 80
   ingress:
     path: /share
+  resources:
+    requests:
+      memory: "500Mi"
+    limits:
+      memory: "1000Mi"
 
 solr:
   replicaCount: 1
@@ -51,21 +61,26 @@ solr:
     path: /solr
   environment:
     SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
+  resources:
+    requests:
+      memory: "250Mi"
+    limits:
+      memory: "500Mi"
 
 postgresql:
   ## If true, install the postgresql chart alongside Alfresco Content Services
   enabled: true
-
   nameOverride: postgresql-acs
   imageTag: "9.4.12"
-
   postgresUser: alfresco
   postgresPassword: alfresco
   postgresDatabase: alfresco
-
   persistence:
     enabled: false
+  resources:
+    requests:
+      memory: "250Mi"
+    limits:
+      memory: "500Mi"
 
-nginx-ingress:
-  ## If true, install the nginx-ingress chart alongside Alfresco Content Services
-  enabled: true
\ No newline at end of file
+replicaCount: 1