diff --git a/NOTICE b/NOTICE
index d9704c772b8aab784dcbafbef274c1f3bec9fb30..c2d84fdf91f41f8a172ad5a6359a278d8e3cce83 100644
--- a/NOTICE
+++ b/NOTICE
@@ -161,7 +161,7 @@ The following software have components provided under the terms of this license:
 - PowerMock (from http://www.powermock.org, https://repo1.maven.org/maven2/org/powermock/powermock-api-mockito)
 - Proton-J (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j)
 - QpidJMS Client (from https://repo1.maven.org/maven2/org/apache/qpid/qpid-jms-client)
-- Redisson (from http://redisson.org)
+- Redisson (from http://redisson.org, https://redisson.pro)
 - Retrofit (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit)
 - RxJava (from https://github.com/ReactiveX/RxJava)
 - SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org, https://bitbucket.org/snakeyaml/snakeyaml)
@@ -279,7 +279,7 @@ The following software have components provided under the terms of this license:
 - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
 - Old JAXB Core (from <https://eclipse-ee4j.github.io/jaxb-ri/>, https://eclipse-ee4j.github.io/jaxb-ri/, https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl)
 - Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils, https://codehaus-plexus.github.io/plexus-utils/, https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
-- Redisson (from http://redisson.org)
+- Redisson (from http://redisson.org, https://redisson.pro)
 - ReflectASM (from https://github.com/EsotericSoftware/reflectasm)
 - Spring Core (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-core)
 
@@ -308,7 +308,7 @@ The following software have components provided under the terms of this license:
 - Hibernate Validator (from https://hibernate.org/validator, https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
 - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
 - Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
-- Redisson (from http://redisson.org)
+- Redisson (from http://redisson.org, https://redisson.pro)
 - reactive-streams (from http://www.reactive-streams.org/)
 
 ========================================================================
diff --git a/provider/unit-aws/build-aws/Dockerfile b/provider/unit-aws/build-aws/Dockerfile
index dc9fc624e2838cfadee2d18c4668c1207ab050f4..cf98461019e0a67e71b2d5d50937bab3028f0f6a 100644
--- a/provider/unit-aws/build-aws/Dockerfile
+++ b/provider/unit-aws/build-aws/Dockerfile
@@ -15,6 +15,10 @@
 # https://docs.spring.io/spring-boot/docs/current/reference/html/deployment.html
 FROM public.ecr.aws/amazoncorretto/amazoncorretto:17
 
+RUN yum update -y && yum install -y shadow-utils \
+    && groupadd -g 10001 -r appgroup \
+    && useradd -M -g 10001 -r -u 10001 appuser
+
 ARG JAR_FILE=provider/unit-aws/target/*spring-boot.jar
 
 #Default to using self signed generated TLS cert
@@ -25,4 +29,5 @@ COPY /data/unit_catalog_v2.json /data/unit_catalog_v2.json
 COPY /provider/unit-aws/build-aws/entrypoint.sh /entrypoint.sh
 EXPOSE 8080
 
+USER 10001:10001
 ENTRYPOINT ["/bin/sh", "-c", ". /entrypoint.sh"]