diff --git a/NOTICE b/NOTICE
index f4ee8f4e2d1c3b12cee8bd74bcc41cd09a188180..98b4782bc1e6ab5c581f8ab14adbf80b5b4f54d5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -344,6 +344,7 @@ The following software have components provided under the terms of this license:
 - springfox-swagger-ui (from https://github.com/springfox/springfox)
 - springfox-swagger2 (from https://github.com/springfox/springfox)
 - swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/core/v3/swagger-annotations, https://repo1.maven.org/maven2/io/swagger/swagger-annotations)
+- swagger-core (from https://repo1.maven.org/maven2/io/swagger/swagger-core)
 - swagger-jaxrs (from https://repo1.maven.org/maven2/io/swagger/swagger-jaxrs)
 - swagger-models (from https://repo1.maven.org/maven2/io/swagger/core/v3/swagger-models)
 - tomcat-embed-core (from http://tomcat.apache.org/)
@@ -360,6 +361,7 @@ The following software have components provided under the terms of this license:
 - GAX (Google Api eXtensions) (from https://github.com/googleapis, https://github.com/googleapis/gax-java)
 - Hamcrest (from http://hamcrest.org/JavaHamcrest/)
 - Hamcrest Core (from http://hamcrest.org/, http://hamcrest.org/JavaHamcrest/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)
+- Hamcrest Library (from http://hamcrest.org/JavaHamcrest/)
 - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
 - Jodd BeanUtil (from http://jodd.org)
 - Jodd Core (from http://jodd.org)
@@ -563,7 +565,7 @@ The following software have components provided under the terms of this license:
 - Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
 - Java Servlet 4.0 API
 - Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
-- JavaBeans Activation Framework
+- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
 - RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
 - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
 - tomcat-embed-core (from http://tomcat.apache.org/)
@@ -671,6 +673,8 @@ LGPL-3.0-only
 ========================================================================
 The following software have components provided under the terms of this license:
 
+- Logback Classic Module (from http://logback.qos.ch, https://repo1.maven.org/maven2/ch/qos/logback/logback-classic)
+- Logback Core Module (from http://logback.qos.ch, https://repo1.maven.org/maven2/ch/qos/logback/logback-core)
 - RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
 
 ========================================================================
diff --git a/devops/gcp/configmap/templates/configmap.yaml b/devops/gcp/configmap/templates/configmap.yaml
index 237389ec3a0003e95d42c09c6559af60f1ef645c..7ec041dc5c2a2b553c33719fffd3442c054c57d6 100644
--- a/devops/gcp/configmap/templates/configmap.yaml
+++ b/devops/gcp/configmap/templates/configmap.yaml
@@ -11,6 +11,6 @@ data:
   ENTITLEMENTS_HOST: "{{ .Values.data.entitlementsHost }}"
   REGISTER_HOST: "{{ .Values.data.registerHost }}"
   PARTITION_HOST: "{{ .Values.data.partitionHost }}"
-  {{- if not $.Values.conf.onPremEnabled }}
+  {{- if not .Values.conf.onPremEnabled }}
   GOOGLE_AUDIENCES: "{{ .Values.data.googleAudiences }}"
   {{- end }}