diff --git a/deployment/configurations/stage.ocelot.social b/deployment/configurations/stage.ocelot.social
index 540bd503b..b3f7838c2 160000
--- a/deployment/configurations/stage.ocelot.social
+++ b/deployment/configurations/stage.ocelot.social
@@ -1 +1 @@
-Subproject commit 540bd503b9401c1608ccda77bdd23fe47ba008fb
+Subproject commit b3f7838c2612a81b031c2ab7b372d0c66e8b9466
diff --git a/deployment/src/kubernetes/templates/backend/Deployment.yaml b/deployment/src/kubernetes/templates/backend/Deployment.yaml
index f475a0173..7125363f5 100644
--- a/deployment/src/kubernetes/templates/backend/Deployment.yaml
+++ b/deployment/src/kubernetes/templates/backend/Deployment.yaml
@@ -39,6 +39,11 @@ spec:
             name: configmap-{{ .Release.Name }}-backend
         - secretRef:
             name: secret-{{ .Release.Name }}-backend
+        resources:
+          requests:
+            memory: {{ .Values.BACKEND.RESOURCE_REQUESTS_MEMORY | default "1G" | quote }}
+          limits:
+            memory: {{ .Values.BACKEND.RESOURCE_LIMITS_MEMORY | default "2G" | quote }}
         ports:
         - containerPort: 4000
           protocol: TCP
diff --git a/deployment/src/kubernetes/templates/maintenance/Deployment.yaml b/deployment/src/kubernetes/templates/maintenance/Deployment.yaml
index fd1aa311a..ec37552d1 100644
--- a/deployment/src/kubernetes/templates/maintenance/Deployment.yaml
+++ b/deployment/src/kubernetes/templates/maintenance/Deployment.yaml
@@ -34,6 +34,11 @@ spec:
               name: configmap-{{ .Release.Name }}-webapp
           - secretRef:
               name: secret-{{ .Release.Name }}-webapp
+        resources:
+          requests:
+            memory: {{ .Values.MAINTENANCE.RESOURCE_REQUESTS_MEMORY | default "500M" | quote }}
+          limits:
+            memory: {{ .Values.MAINTENANCE.RESOURCE_LIMITS_MEMORY | default "1G" | quote }}
         ports:
           - containerPort: 80
       restartPolicy: {{ .Values.MAINTENANCE.CONTAINER_RESTART_POLICY }}
diff --git a/deployment/src/kubernetes/templates/webapp/Deployment.yaml b/deployment/src/kubernetes/templates/webapp/Deployment.yaml
index a334738ec..9dbe6aefb 100644
--- a/deployment/src/kubernetes/templates/webapp/Deployment.yaml
+++ b/deployment/src/kubernetes/templates/webapp/Deployment.yaml
@@ -40,5 +40,10 @@ spec:
             name: configmap-{{ .Release.Name }}-webapp
         - secretRef:
             name: secret-{{ .Release.Name }}-webapp
+        resources:
+          requests:
+            memory: {{ .Values.WEBAPP.RESOURCE_REQUESTS_MEMORY | default "1G" | quote }}
+          limits:
+            memory: {{ .Values.WEBAPP.RESOURCE_LIMITS_MEMORY | default "2G" | quote }}
       restartPolicy: {{ .Values.WEBAPP.CONTAINER_RESTART_POLICY }}
       terminationGracePeriodSeconds: {{ .Values.WEBAPP.CONTAINER_TERMINATION_GRACE_PERIOD_SECONDS }}
\ No newline at end of file