diff --git a/Dockerfile b/Dockerfile
index a7559c6..65b6145 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,14 +13,18 @@ COPY public ./public
 
 RUN yarn build
 
-FROM nginx:1.15.12-alpine
-ENV NGINX_USER=nginx
+FROM nginx:1.16-alpine
+ENV NGINX_USER=svc_nginx_hmda
 RUN rm -rf /etc/nginx/conf.d
 COPY nginx /etc/nginx
 COPY --from=build-stage /usr/src/app/build /usr/share/nginx/html/hmda-help
-RUN apk --no-cache add shadow && \
-    usermod -l $NGINX_USER nginx && \
-    groupmod -n $NGINX_USER nginx && \
-    chown -R $NGINX_USER:$NGINX_USER /etc/nginx /usr/share/nginx/html/hmda-help
-EXPOSE 80
+RUN adduser -S $NGINX_USER nginx && \
+    addgroup -S $NGINX_USER && \
+    addgroup $NGINX_USER $NGINX_USER && \
+    touch /run/nginx.pid && \
+    chown -R $NGINX_USER:$NGINX_USER /etc/nginx /run/nginx.pid /var/cache/nginx/
+
+ EXPOSE 8080
+
+ USER svc_nginx_hmda
 CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/kubernetes/hmda-help/templates/deployment.yaml b/kubernetes/hmda-help/templates/deployment.yaml
index 55d30f8..fd9cee6 100644
--- a/kubernetes/hmda-help/templates/deployment.yaml
+++ b/kubernetes/hmda-help/templates/deployment.yaml
@@ -35,7 +35,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 80
+              containerPort: 8080
               protocol: TCP
           livenessProbe:
             httpGet:
diff --git a/kubernetes/hmda-help/values.yaml b/kubernetes/hmda-help/values.yaml
index 7f212e5..feda1f8 100644
--- a/kubernetes/hmda-help/values.yaml
+++ b/kubernetes/hmda-help/values.yaml
@@ -15,7 +15,7 @@ fullnameOverride: ''
 
 service:
   type: ClusterIP
-  port: 80
+  port: 8080
 
 #ambassador:
 #  service:
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 48b7412..e059206 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -46,7 +46,7 @@ http {
   }
 
   server {
-    listen 80;
+    listen 8080;
     root /usr/share/nginx/html/;
     autoindex off;
     access_log /dev/stdout;