diff --git a/docker/Dockerfile.arouter b/docker/Dockerfile.arouter
index 5401514..659d78b 100644
--- a/docker/Dockerfile.arouter
+++ b/docker/Dockerfile.arouter
@@ -30,4 +30,3 @@
 COPY --from=build-env /build/arouter.json /app/
 COPY --from=build-env /build/voltha.pb /app
 
-ENTRYPOINT ["/app/afrouter"]
diff --git a/docker/Dockerfile.arouterTest b/docker/Dockerfile.arouterTest
index 6917937..95bc215 100644
--- a/docker/Dockerfile.arouterTest
+++ b/docker/Dockerfile.arouterTest
@@ -37,4 +37,3 @@
 COPY --from=build-env /build/voltha.pb /app
 COPY --from=build-env /build/tests /app/tests/
 
-ENTRYPOINT ["/app/afrouterTest"]
diff --git a/docker/Dockerfile.arouterd b/docker/Dockerfile.arouterd
index 2d5f139..59fac45 100644
--- a/docker/Dockerfile.arouterd
+++ b/docker/Dockerfile.arouterd
@@ -29,4 +29,3 @@
 COPY --from=build-env /build/arouterd /app/
 COPY --from=build-env /build/arouter.json /app/
 
-ENTRYPOINT ["/app/arouterd"]
diff --git a/docker/Dockerfile.ro_core b/docker/Dockerfile.ro_core
index f4bb80c..8d561c2 100644
--- a/docker/Dockerfile.ro_core
+++ b/docker/Dockerfile.ro_core
@@ -23,4 +23,3 @@
 # Copy required files
 COPY --from=build-env /build/ro_core /app/
 
-ENTRYPOINT ["/app/ro_core"]
diff --git a/docker/Dockerfile.rw_core b/docker/Dockerfile.rw_core
index 23c4ccb..ca83f13 100644
--- a/docker/Dockerfile.rw_core
+++ b/docker/Dockerfile.rw_core
@@ -23,4 +23,3 @@
 # Copy required files
 COPY --from=build-env /build/rw_core /app/
 
-ENTRYPOINT ["/app/rw_core"]
diff --git a/docker/Dockerfile.simulated_olt b/docker/Dockerfile.simulated_olt
index 974f7d0..4a3f548 100644
--- a/docker/Dockerfile.simulated_olt
+++ b/docker/Dockerfile.simulated_olt
@@ -24,4 +24,3 @@
 # Copy required files
 COPY --from=build-env /build/simulated_olt /app/
 
-ENTRYPOINT ["/app/simulated_olt"]
diff --git a/docker/Dockerfile.simulated_onu b/docker/Dockerfile.simulated_onu
index 4b96290..d5df9cf 100644
--- a/docker/Dockerfile.simulated_onu
+++ b/docker/Dockerfile.simulated_onu
@@ -25,4 +25,3 @@
 # Copy required files
 COPY --from=build-env /build/simulated_onu /app/
 
-ENTRYPOINT ["/app/simulated_onu"]