diff --git a/deploy-service/.dockerignore b/deploy-service/.dockerignore
new file mode 100644
index 0000000000..f2a4093411
--- /dev/null
+++ b/deploy-service/.dockerignore
@@ -0,0 +1 @@
+**/target
\ No newline at end of file
diff --git a/deploy-service/Dockerfile.dev b/deploy-service/Dockerfile.dev
index a6ae2b6960..a04473c59b 100644
--- a/deploy-service/Dockerfile.dev
+++ b/deploy-service/Dockerfile.dev
@@ -2,7 +2,8 @@ FROM maven:3.8-openjdk-8-slim AS builder
 
 COPY . /deploy-service
 
-RUN cd /deploy-service && mvn clean package -DskipTests
+RUN --mount=type=cache,target=/m2 \
+    cd /deploy-service && mvn package -DskipTests -Dmaven.repo.local=/m2 -Dassembly.skipAssembly=true
 
 FROM openjdk:8
 
@@ -11,10 +12,7 @@ ENV PROJECT_DIR=/opt/deploy-service
 RUN mkdir $PROJECT_DIR
 WORKDIR $PROJECT_DIR
 
-COPY --from=builder /deploy-service/teletraanservice/target/teletraan-service-0.1-SNAPSHOT-bin.tar.gz $PROJECT_DIR
-RUN tar zxf teletraan-service-0.1-SNAPSHOT-bin.tar.gz
-COPY ./teletraanservice $PROJECT_DIR/teletraanservice
+COPY --from=builder /deploy-service/teletraanservice/target $PROJECT_DIR/teletraanservice
+COPY teletraanservice/bin $PROJECT_DIR/teletraanservice/bin
 
-# Default command to run service, do not override it unless for staging run.
-# Use "docker logs ID" to view stdout and stderr
-CMD ["scripts/run_in_container.sh"]
+CMD ["teletraanservice/bin/run.sh", "-c", "teletraanservice/bin/server.yaml"]
\ No newline at end of file
diff --git a/deploy-service/teletraanservice/Dockerfile b/deploy-service/teletraanservice/Dockerfile
deleted file mode 100644
index 68a5f83de4..0000000000
--- a/deploy-service/teletraanservice/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM openjdk:8
-
-ENV PROJECT_DIR=/opt/deploy-service
-
-RUN mkdir $PROJECT_DIR
-WORKDIR $PROJECT_DIR
diff --git a/deploy-service/teletraanservice/bin/run.sh b/deploy-service/teletraanservice/bin/run.sh
index e3decc4486..f6313eb0cf 100755
--- a/deploy-service/teletraanservice/bin/run.sh
+++ b/deploy-service/teletraanservice/bin/run.sh
@@ -48,6 +48,8 @@ function server_start {
     com.pinterest.teletraan.TeletraanService \
     server ${CONFIG_FILE}"
 
+    echo $OPTS
+
     if [ "$1" == "FOREGROUND" ]
     then
         ${JAVA_CMD} ${OPTS}