diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index 65b7a6f..5422d00 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/volt-synchronizer:candidate -f Dockerfile.synchronizer .
-
 # xosproject/volt-synchronizer
 
 FROM xosproject/xos-synchronizer-base:candidate
 
-ADD xos/synchronizer /opt/xos/synchronizers/volt
-ADD VERSION /opt/xos/synchronizers/volt/
-ADD samples/onu_activate_event.py /opt/xos/synchronizers/volt/
-
-ENTRYPOINT []
+COPY xos/synchronizer /opt/xos/synchronizers/volt
+COPY VERSION /opt/xos/synchronizers/volt/
+COPY samples/onu_activate_event.py /opt/xos/synchronizers/volt/
 
 WORKDIR "/opt/xos/synchronizers/volt"
 
@@ -56,4 +51,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 python volt-synchronizer.py
+CMD ["/usr/bin/python", "/opt/xos/synchronizers/volt/volt-synchronizer.py"]
diff --git a/xos/synchronizer/volt-synchronizer.py b/xos/synchronizer/volt-synchronizer.py
index 25ab599..3443ca5 100755
--- a/xos/synchronizer/volt-synchronizer.py
+++ b/xos/synchronizer/volt-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