diff --git a/NOTICE b/NOTICE
index aa8b2ffffdf41e7a595a8eaecf694426f529ecbc..e4fcdfd7022ad80bf01b8911005194db29c60860 100644
--- a/NOTICE
+++ b/NOTICE
@@ -223,7 +223,7 @@ The following software have components provided under the terms of this license:
 - Protocol Buffer extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-protobuf)
 - Proton-J (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j)
 - QpidJMS Client (from )
-- Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty)
+- Reactor Netty with all modules (from https://github.com/reactor/reactor-netty)
 - Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit)
 - Servlet Specification 2.5 API (from http://jetty.mortbay.org)
 - SnakeYAML (from http://www.snakeyaml.org)
@@ -623,7 +623,6 @@ The following software have components provided under the terms of this license:
 - Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions)
 - JUL to SLF4J bridge (from http://www.slf4j.org)
 - Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
-- Java JWT (from http://www.jwt.io)
 - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
 - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
 - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
@@ -655,6 +654,7 @@ The following software have components provided under the terms of this license:
 - adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java)
 - azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/)
 - documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/)
+- java jwt (from https://github.com/auth0/java-jwt)
 - micrometer-core (from https://github.com/micrometer-metrics/micrometer)
 - mockito-core (from https://github.com/mockito/mockito)
 - mockito-core (from https://github.com/mockito/mockito)
diff --git a/devops/azure/chart/helm-config.yaml b/devops/azure/chart/helm-config.yaml
index d2c8d58c42609f7c97025822e66c6610759cbe33..2be1682717f591beab15bcaab8ab7d365fa5feaf 100644
--- a/devops/azure/chart/helm-config.yaml
+++ b/devops/azure/chart/helm-config.yaml
@@ -15,4 +15,11 @@ image:
   branch: #{ENVIRONMENT_NAME}#
   tag: #{Build.SourceVersion}#
 
-istioDnsHost: #{ISTIO_DNS_HOST}#
\ No newline at end of file
+istioDnsHost: #{ISTIO_DNS_HOST}#
+
+env: #{ENVIRONMENT_NAME}#
+
+featureFlag:
+  resourceLimits:
+    enabledEnvs:
+    - demo
diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml
index b18f027d5a39f46f9b5caf22416f68c8186f571c..9d69bc4b8487c7d7c4050e800c380bcc76556d00 100644
--- a/devops/azure/chart/templates/deployment.yaml
+++ b/devops/azure/chart/templates/deployment.yaml
@@ -45,6 +45,15 @@ spec:
         imagePullPolicy: Always
         ports:
         - containerPort: 80
+        {{- if has .Values.env .Values.featureFlag.resourceLimits.enabledEnvs }}
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "600Mi"
+          limits:
+            cpu: "1000m"
+            memory: "1Gi"
+        {{- end }}
         readinessProbe:
           httpGet:
             path: /actuator/health
diff --git a/devops/azure/chart/values.yaml b/devops/azure/chart/values.yaml
index 05e5ffd27a959524f9607f8fc11a653466fbcc03..9c987e7e65b5187ddf59a93ec4ba947223173f41 100644
--- a/devops/azure/chart/values.yaml
+++ b/devops/azure/chart/values.yaml
@@ -22,4 +22,11 @@ image:
   branch: master
   tag: latest
 
-istioDnsHost: ""
\ No newline at end of file
+istioDnsHost: ""
+
+env: demo
+
+featureFlag:
+  resourceLimits:
+    enabledEnvs:
+    - demo