diff --git a/Makefile b/Makefile
index 37a46b4..bc792b1 100755
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,18 @@
+# Copyright 2021 Xoriant Corporation
+#
+# 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.
+#
+#
 default: all
 
 all:
diff --git a/agent/Dockerfile b/agent/Dockerfile
index 7b0e92b..bb2a10e 100755
--- a/agent/Dockerfile
+++ b/agent/Dockerfile
@@ -1,4 +1,5 @@
-# Copyright 2017 AT&T Intellectual Property, Inc
+# Original work Copyright 2017 AT&T Intellectual Property, Inc
+# Modified work Copyright 2021 Xoriant Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,23 +18,22 @@
 # Status: this is a work in progress, under test.
 #
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 
 RUN mkdir /opt/ves
 
 RUN apt-get update && apt-get -y upgrade
+RUN apt-get install -y tzdata
 # Required for kafka: default-jre zookeeperd python-pip kafka-python
 # Required for building librdkafka:  git build-essential
 # libpthread-stubs0-dev libssl-dev libsasl2-dev liblz4-dev
 # (or libz-dev?)
 # Required for building collectd: pkg-config
-RUN apt-get install -y default-jre zookeeperd \
-python-pip pkg-config git build-essential libpthread-stubs0-dev \
-libssl-dev libsasl2-dev liblz4-dev libz-dev
-RUN pip install kafka-python
 
-# Install VES Agent
-RUN pip install pyaml
+RUN apt-get install -y default-jre zookeeperd \
+python3 python3-pip pkg-config git build-essential libpthread-stubs0-dev \
+libssl-dev libsasl2-dev liblz4-dev libz-dev
+RUN pip3 install kafka-python pyaml
 
 RUN mkdir /opt/ves/barometer
 ADD barometer /opt/ves/barometer
diff --git a/agent/Makefile b/agent/Makefile
index 41eef3c..966ec40 100755
--- a/agent/Makefile
+++ b/agent/Makefile
@@ -1,3 +1,18 @@
+# Copyright 2021 Xoriant Corporation
+#
+# 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.
+#
+
 default: all
 
 all:
diff --git a/agent/start.sh b/agent/start.sh
index ca9a17d..3ba501a 100755
--- a/agent/start.sh
+++ b/agent/start.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-# Copyright 2017 AT&T Intellectual Property, Inc
+# Original work Copyright 2017 AT&T Intellectual Property, Inc
+# Modified work Copyright 2021 Xoriant Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,7 +44,7 @@
   ves_loglevel=ERROR
 fi
 
-python ves_app.py --events-schema=$ves_mode.yaml --loglevel $ves_loglevel \
+python3 ves_app.py --events-schema=$ves_mode.yaml --loglevel $ves_loglevel \
   --config=ves_app_config.conf
 
 # Dump ves_app.log if the command above exits (fails)
diff --git a/collector/Makefile b/collector/Makefile
index 1e4060f..1446064 100644
--- a/collector/Makefile
+++ b/collector/Makefile
@@ -1,3 +1,18 @@
+# Copyright 2021 Xoriant Corporation
+#
+# 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.
+#
+
 default: all
 
 all:
diff --git a/collector/start.sh b/collector/start.sh
index baee89a..534c220 100755
--- a/collector/start.sh
+++ b/collector/start.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-# Copyright 2017-2018 AT&T Intellectual Property, Inc
+# Original work Copyright 2017-2018 AT&T Intellectual Property, Inc
+# Modified work Copyright 2021 Xoriant Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/kafka/Dockerfile b/kafka/Dockerfile
index 5d79429..ce59204 100755
--- a/kafka/Dockerfile
+++ b/kafka/Dockerfile
@@ -1,4 +1,5 @@
-# Copyright 2017 AT&T Intellectual Property, Inc
+# Original work Copyright 2017 AT&T Intellectual Property, Inc
+# Modified work Copyright 2021 Xoriant Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/kafka/Makefile b/kafka/Makefile
index 001aad2..1570a8b 100755
--- a/kafka/Makefile
+++ b/kafka/Makefile
@@ -1,3 +1,18 @@
+# Copyright 2021 Xoriant Corporation
+#
+# 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.
+#
+
 default: all
 
 all:
diff --git a/ves-start.sh b/ves-start.sh
index e188c89..b5ef2c6 100755
--- a/ves-start.sh
+++ b/ves-start.sh
@@ -1,5 +1,18 @@
 #!/bin/bash
-
+# Copyright 2021 Xoriant Corporation
+#
+# 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.
+#
 # Script to build ves project and its dependent containers
 # Maintainer shrinivas.joshi@xoriant.com
 
diff --git a/ves-stop.sh b/ves-stop.sh
index b6311ca..210072a 100755
--- a/ves-stop.sh
+++ b/ves-stop.sh
@@ -1,3 +1,18 @@
 #!/bin/bash
+# Copyright 2021 Xoriant Corporation
+#
+# 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.
+#
+
 echo "Stopping all containers"
 docker stop $(docker ps -aq)