diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index e04397c..eff0f5b 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,17 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# docker build -t xosproject/vsg-hw-synchronizer:candidate -f Dockerfile.synchronizer .
-
-
 # xosproject/vsg-synchronizer
+
 FROM xosproject/xos-synchronizer-base:candidate
 
 COPY xos/synchronizer /opt/xos/synchronizers/vsg-hw
 COPY VERSION /opt/xos/synchronizers/vsg-hw/
 
-ENTRYPOINT []
-
 WORKDIR "/opt/xos/synchronizers/vsg-hw"
 
 # Label image
@@ -55,4 +50,4 @@
       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/vsg-hw; python vsg-hw-synchronizer.py"
+CMD ["/usr/bin/python", "/opt/xos/synchronizers/vsg-hw/vsg-hw-synchronizer.py"]
diff --git a/xos/synchronizer/vsg-hw-synchronizer.py b/xos/synchronizer/vsg-hw-synchronizer.py
index 1368d6c..22ec365 100755
--- a/xos/synchronizer/vsg-hw-synchronizer.py
+++ b/xos/synchronizer/vsg-hw-synchronizer.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 
 # Copyright 2017-present Open Networking Foundation
 #
@@ -13,9 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-#!/usr/bin/env python
-
 # This imports and runs ../../xos-observer.py
 
 import importlib