diff --git a/charts/localstack/README.md b/charts/localstack/README.md
index 529780c..fcb6fbb 100644
--- a/charts/localstack/README.md
+++ b/charts/localstack/README.md
@@ -92,9 +92,12 @@ The following table lists the configurable parameters of the Localstack chart an
 | `image.tag`                                          | Localstack image tag                                                                                                                                                                                                                  | `latest`                                                |
 | `image.pullPolicy`                                   | Localstack image pull policy                                                                                                                                                                                                          | `IfNotPresent`                                          |
 | `image.pullSecrets`                                  | Specify docker-registry secret names as an array                                                                                                                                                                                      | `[]`                                                    |
-| `podLabels`                                          | Additional pod labels for Localstack secondary pods                                                                                                                                                                              | `{}`                                                    |
+| `podLabels`                                          | Additional pod labels for Localstack secondary pods                                                                                                                                                                                   | `{}`                                                    |
 | `podAnnotations`                                     | Additional pod annotations for Localstack secondary pods                                                                                                                                                                              | `{}`                                                    |
 | `podSecurityContext`                                 | Enable security context for Localstack pods                                                                                                                                                                                           | `{}`                                                    |
+| `extraDeploy`                                        | Extra objects to deploy (value evaluated as a template)                                                                                                                                                                               | `{}`                                                    |
+| `extraAnnotations`                                   | Add additional annotations to every resource (value evaluated as a template)                                                                                                                                                          | `{}`                                                    |
+| `extraLabels`                                        | Add additional labels to every resource (value evaluated as a template)                                                                                                                                                               | `{}`                                                    |
 | `securityContext`                                    | Localstack container securityContext                                                                                                                                                                                                  | `{}`                                                    |
 
 ### Localstack parameters
@@ -103,11 +106,11 @@ The following table lists the configurable parameters of the Localstack chart an
 |------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------|
 | `debug`                                              | Specify if debug logs should be enabled                                                                                                                                                                                               | `false`                                                 |
 | `kinesisErrorProbability`                            | Specify to randomly inject ProvisionedThroughputExceededException errors into Kinesis API responses                                                                                                                                   | `nil` (Localstack Default)                              |
-| `startServices`                                      | Comma-separated list of AWS CLI service names which should be loaded right when starting LocalStack. If not set, each service is loaded and started on the first request for that service.                                          | `nil` (Localstack Default)                              |
+| `startServices`                                      | Comma-separated list of AWS CLI service names which should be loaded right when starting LocalStack. If not set, each service is loaded and started on the first request for that service.                                            | `nil` (Localstack Default)                              |
 | `lambdaExecutor`                                     | Specify Method to use for executing Lambda functions (partially supported)                                                                                                                                                            | `docker`                                                |
 | `extraEnvVars`                                       | Extra environment variables to be set on Localstack primary containers                                                                                                                                                                | `nil` (Localstack Default)                              |
 | `enableStartupScripts`                               | Mount `/etc/localstack/init/ready.d` to run startup scripts with `{{ template "localstack.fullname" . }}-init-scripts-config` configMap                                                                                               | `false`                                                 |
-| `startupScriptContent`                               | Startup script content when `enableStartupScripts` is `true`. Note: You will need to add a shebang as your first line such as `!#/bin/sh` in order to ensure the startup script is not malformed.                                                                                                                                                                       | `nil` (Localstack Default)                              |
+| `startupScriptContent`                               | Startup script content when `enableStartupScripts` is `true`. Note: You will need to add a shebang as your first line such as `!#/bin/sh` in order to ensure the startup script is not malformed.                                     | `nil` (Localstack Default)                              |
 
 ### Deployment parameters
 
diff --git a/charts/localstack/templates/_helpers.tpl b/charts/localstack/templates/_helpers.tpl
index 696a0d1..2d3cc66 100644
--- a/charts/localstack/templates/_helpers.tpl
+++ b/charts/localstack/templates/_helpers.tpl
@@ -40,6 +40,9 @@ helm.sh/chart: {{ include "localstack.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.extraLabels }}
+{{ toYaml .Values.extraLabels }}
+{{- end }}
 {{- end }}
 
 {{/*
diff --git a/charts/localstack/values.yaml b/charts/localstack/values.yaml
index 8622b49..c716854 100644
--- a/charts/localstack/values.yaml
+++ b/charts/localstack/values.yaml
@@ -23,9 +23,12 @@ fullnameOverride: ""
 ##
 extraDeploy: []
 
-## Add additional annotations to every resource
+## @param extraAnnotations Add additional annotations to every resource (value evaluated as a template)
 extraAnnotations: {}
 
+## @param extraLabels Add additional labels to every resource (value evaluated as a template)
+extraLabels: {}
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: true