diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
deleted file mode 100644
index c47d622..0000000
--- a/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM openjdk:8u191-jdk-alpine3.9
-
-MAINTAINER "The Onap Team"
-LABEL Description="This immage contains alpine, openjdk 11 and clamp"
-
-ARG http_proxy
-ARG https_proxy
-ENV HTTP_PROXY=$http_proxy
-ENV HTTPS_PROXY=$https_proxy
-ENV http_proxy=$HTTP_PROXY
-ENV https_proxy=$HTTPS_PROXY
-
-RUN addgroup onap && adduser -D -G onap clamp
-VOLUME /opt/clamp/config
-RUN mkdir /var/log/onap
-RUN chmod a+rwx /var/log/onap
-
-COPY onap-clamp/clamp.jar /opt/clamp/app.jar
-RUN chmod 700 /opt/clamp/app.jar
-
-RUN chown -R clamp:onap /opt/clamp
-
-RUN apk add fontconfig
-RUN apk add ttf-dejavu
-
-RUN ln -s /usr/lib/libfontconfig.so.1 /usr/lib/libfontconfig.so && \
-  ln -s /lib/libuuid.so.1 /usr/lib/libuuid.so.1 && \
-  ln -s /lib/libc.musl-x86_64.so.1 /usr/lib/libc.musl-x86_64.so.1
-
-ENV LD_LIBRARY_PATH /usr/lib
-
-USER clamp
-WORKDIR /opt/clamp/
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms256m", "-Xmx1g", "-jar" ,"./app.jar"]
diff --git a/src/main/docker/backend/Dockerfile b/src/main/docker/backend/Dockerfile
new file mode 100644
index 0000000..9e5c8d8
--- /dev/null
+++ b/src/main/docker/backend/Dockerfile
@@ -0,0 +1,57 @@
+###
+# ============LICENSE_START=======================================================
+# ONAP CLAMP
+# ================================================================================
+# Copyright (C) 2018 AT&T Intellectual Property. All rights
+#                             reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END============================================
+# ===================================================================
+#
+###
+
+FROM openjdk:8u191-jdk-alpine3.9
+
+MAINTAINER "The Onap Team"
+LABEL Description="This immage contains alpine, openjdk 11 and clamp"
+
+ARG http_proxy
+ARG https_proxy
+ENV HTTP_PROXY=$http_proxy
+ENV HTTPS_PROXY=$https_proxy
+ENV http_proxy=$HTTP_PROXY
+ENV https_proxy=$HTTPS_PROXY
+
+RUN addgroup onap && adduser -D -G onap clamp
+VOLUME /opt/clamp/config
+RUN mkdir /var/log/onap
+RUN chmod a+rwx /var/log/onap
+
+COPY onap-clamp-backend/clamp.jar /opt/clamp/app.jar
+RUN chmod 700 /opt/clamp/app.jar
+
+RUN chown -R clamp:onap /opt/clamp
+
+RUN apk add fontconfig
+RUN apk add ttf-dejavu
+
+RUN ln -s /usr/lib/libfontconfig.so.1 /usr/lib/libfontconfig.so && \
+  ln -s /lib/libuuid.so.1 /usr/lib/libuuid.so.1 && \
+  ln -s /lib/libc.musl-x86_64.so.1 /usr/lib/libc.musl-x86_64.so.1
+
+ENV LD_LIBRARY_PATH /usr/lib
+
+USER clamp
+WORKDIR /opt/clamp/
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms256m", "-Xmx1g", "-jar" ,"./app.jar"]
diff --git a/src/main/docker/assembly/clamp-files.xml b/src/main/docker/backend/backend-files.xml
similarity index 80%
rename from src/main/docker/assembly/clamp-files.xml
rename to src/main/docker/backend/backend-files.xml
index e4e9875..7a9c6f5 100644
--- a/src/main/docker/assembly/clamp-files.xml
+++ b/src/main/docker/backend/backend-files.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP MSO
+  ECOMP CLAMP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -29,7 +29,6 @@
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
 
-
 	<fileSets>
 		<!-- include config files -->
 		<fileSet>
@@ -39,20 +38,6 @@
 			<directory>${project.build.directory}</directory>
 			<outputDirectory>/</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<includes>
-				<include>>etc/config/**</include>
-			</includes>
-			<directory>${project.build.directory}</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<includes>
-				<include>etc/keystore/**</include>
-			</includes>
-			<directory>${project.build.directory}</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
 	</fileSets>
 
 </assembly>
diff --git a/src/main/docker/frontend/Dockerfile b/src/main/docker/frontend/Dockerfile
new file mode 100644
index 0000000..8c755b0
--- /dev/null
+++ b/src/main/docker/frontend/Dockerfile
@@ -0,0 +1,52 @@
+###
+# ============LICENSE_START=======================================================
+# ONAP CLAMP
+# ================================================================================
+# Copyright (C) 2019 AT&T Intellectual Property. All rights
+#                             reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END============================================
+# ===================================================================
+#
+###
+
+# build environment
+FROM node:12.4-alpine as build
+WORKDIR /app
+#ENV PATH /app/node_modules/.bin:$PATH
+COPY onap-clamp-frontend/ /app/
+RUN npm install --silent
+RUN npm run build
+
+FROM nginx:1.17.0-alpine
+
+MAINTAINER "The Onap Team"
+LABEL Description="This image contains Clamp frontend"
+
+ARG http_proxy
+ARG https_proxy
+ENV HTTP_PROXY=$http_proxy
+ENV HTTPS_PROXY=$https_proxy
+ENV http_proxy=$HTTP_PROXY
+ENV https_proxy=$HTTPS_PROXY
+
+RUN addgroup onap && adduser -D -G onap clamp
+RUN mkdir /var/log/onap
+RUN chmod a+rwx /var/log/onap
+
+COPY --from=build /app/build /usr/share/nginx/html
+RUN rm /etc/nginx/conf.d/default.conf
+COPY onap-clamp-frontend/nginx/nginx.conf /etc/nginx/conf.d
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/src/main/docker/assembly/clamp-files.xml b/src/main/docker/frontend/frontend-files.xml
similarity index 70%
copy from src/main/docker/assembly/clamp-files.xml
copy to src/main/docker/frontend/frontend-files.xml
index e4e9875..2610e82 100644
--- a/src/main/docker/assembly/clamp-files.xml
+++ b/src/main/docker/frontend/frontend-files.xml
@@ -1,8 +1,8 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP MSO
+  ECOMP CLAMP
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -29,28 +29,13 @@
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
 
-
 	<fileSets>
 		<!-- include config files -->
 		<fileSet>
-			<includes>
-				<include>${project.build.finalName}.jar</include>
-			</includes>
-			<directory>${project.build.directory}</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<includes>
-				<include>>etc/config/**</include>
-			</includes>
-			<directory>${project.build.directory}</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<includes>
-				<include>etc/keystore/**</include>
-			</includes>
-			<directory>${project.build.directory}</directory>
+			<excludes>
+				<exclude>node_modules</exclude>
+			</excludes>
+			<directory>${project.basedir}/ui-react</directory>
 			<outputDirectory>/</outputDirectory>
 		</fileSet>
 	</fileSets>
diff --git a/src/main/docker/kibana/Dockerfile.kibana b/src/main/docker/kibana/Dockerfile
similarity index 100%
rename from src/main/docker/kibana/Dockerfile.kibana
rename to src/main/docker/kibana/Dockerfile
diff --git a/src/main/docker/logstash/Dockerfile.logstash b/src/main/docker/logstash/Dockerfile
similarity index 64%
rename from src/main/docker/logstash/Dockerfile.logstash
rename to src/main/docker/logstash/Dockerfile
index f307509..73988dc 100644
--- a/src/main/docker/logstash/Dockerfile.logstash
+++ b/src/main/docker/logstash/Dockerfile
@@ -1,17 +1,25 @@
-# Copyright (c) 2018 AT&T Intellectual Property.  All rights reserved.
-#
+###
+# ============LICENSE_START=======================================================
+# ONAP CLAMP
+# ================================================================================
+# Copyright (C) 2018 AT&T Intellectual Property. All rights
+#                             reserved.
+# ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+# ============LICENSE_END============================================
+# ===================================================================
+#
+###
 FROM  docker.elastic.co/logstash/logstash-oss:6.6.2
 
 MAINTAINER "The Onap Team"
diff --git a/src/main/resources/boot-message.txt b/src/main/resources/boot-message.txt
index 92e4ab0..46b0a6f 100644
--- a/src/main/resources/boot-message.txt
+++ b/src/main/resources/boot-message.txt
@@ -1,14 +1,15 @@
      
          
- _____  _  _    __    ____    ____  __  __  ____  __    ____  _  _ 
-(  _  )( \( )  /__\  (  _ \  (  _ \(  )(  )(  _ \(  )  (_  _)( \( )
- )(_)(  )  (  /(__)\  )___/   )(_) ))(__)(  ) _ < )(__  _)(_  )  ( 
-(_____)(_)\_)(__)(__)(__)    (____/(______)(____/(____)(____)(_)\_)
-                 ___  __      __    __  __  ____                                  
-                / __)(  )    /__\  (  \/  )(  _ \                                 
-               ( (__  )(__  /(__)\  )    (  )___/                                 
-                \___)(____)(__)(__)(_/\/\_)(__)                                   
-
+       ▐ ▄  ▄▄▄·  ▄▄▄·    ▄▄▄ .▄▄▌       ▄▄▄· ▄▄▌ ▄▄▄▄▄      
+▪     •█▌▐█▐█ ▀█ ▐█ ▄█    ▀▄.▀·██•      ▐█ ▀█ ██• •██  ▪     
+ ▄█▀▄ ▐█▐▐▌▄█▀▀█  ██▀·    ▐▀▀▪▄██▪      ▄█▀▀█ ██▪  ▐█.▪ ▄█▀▄ 
+▐█▌.▐▌██▐█▌▐█ ▪▐▌▐█▪·•    ▐█▄▄▌▐█▌▐▌    ▐█ ▪▐▌▐█▌▐▌▐█▌·▐█▌.▐▌
+ ▀█▄▀▪▀▀ █▪ ▀  ▀ .▀        ▀▀▀ .▀▀▀      ▀  ▀ .▀▀▀ ▀▀▀  ▀█▄▀▪
+                ▄▄· ▄▄▌   ▄▄▄· • ▌ ▄ ·.  ▄▄▄·                               
+               ▐█ ▌▪██•  ▐█ ▀█ ·██ ▐███▪▐█ ▄█                               
+               ██ ▄▄██▪  ▄█▀▀█ ▐█ ▌▐▌▐█· ██▀·                               
+               ▐███▌▐█▌▐▌▐█ ▪▐▌██ ██▌▐█▌▐█▪·•                               
+               ·▀▀▀ .▀▀▀  ▀  ▀ ▀▀  █▪▀▀▀.▀      
 
 
    :: Starting ::     
\ No newline at end of file