diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index d989983..cb06078 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -1,4 +1,3 @@
-
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,15 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 # xosproject/addressmanager-synchronizer
 
 FROM xosproject/xos-synchronizer-base:candidate
 
-ADD xos/synchronizer /opt/xos/synchronizers/addressmanager
-ADD VERSION /opt/xos/synchronizers/addressmanager/
-
-ENTRYPOINT []
+COPY xos/synchronizer /opt/xos/synchronizers/addressmanager
+COPY VERSION /opt/xos/synchronizers/addressmanager/
 
 WORKDIR "/opt/xos/synchronizers/addressmanager"
 
@@ -54,4 +50,5 @@
       org.opencord.component.xos.vcs-url=$org_opencord_component_xos_vcs_url \
       org.opencord.component.xos.vcs-ref=$org_opencord_component_xos_vcs_ref
 
-CMD bash -c "service filebeat start; cd /opt/xos/synchronizers/addressmanager; ./run.sh"
+CMD ["/usr/bin/python", "/opt/xos/synchronizers/addressmanager/addressmanager-synchronizer.py"]
+
diff --git a/xos/synchronizer/run.sh b/xos/synchronizer/run.sh
deleted file mode 100755
index 47e83f9..0000000
--- a/xos/synchronizer/run.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# 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.
-
-
-python addressmanager-synchronizer.py