diff --git a/docker-compose.yml b/docker-compose.yml
index 7674161c9..13760b95d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,8 +42,7 @@ services:
       PORT: 9180
       AWS_ACCESS_KEY_ID:
       AWS_SECRET_ACCESS_KEY:
-      RUNNER_HOST: localhost
-      RUNNER_PORT: 7001
+      GRPC_SERVER_PORT: 7001
 
   redis:
     image: redis
diff --git a/runner/Dockerfile b/runner/Dockerfile
index 779b3adde..c5b68c113 100644
--- a/runner/Dockerfile
+++ b/runner/Dockerfile
@@ -9,4 +9,5 @@ WORKDIR /usr/src/app
 COPY --from=builder /usr/src/app/package*.json ./
 RUN npm install --omit=dev
 COPY --from=builder /usr/src/app/dist ./dist
+COPY protos ./protos
 CMD [ "npm", "run", "start:docker" ]
diff --git a/runner/src/server/runner-server.ts b/runner/src/server/runner-server.ts
index 23c6b5d29..64b1d4652 100644
--- a/runner/src/server/runner-server.ts
+++ b/runner/src/server/runner-server.ts
@@ -17,11 +17,10 @@ export default function startRunnerServer (executors: Map<string, StreamHandler>
   server.addService(runnerProto.runner.Runner.service, getRunnerService(executors));
   const credentials = grpc.ServerCredentials;
 
-  assert(process.env.RUNNER_HOST, 'RUNNER_HOST is not defined');
-  assert(process.env.RUNNER_PORT, 'RUNNER_PORT is not defined');
+  assert(process.env.GRPC_SERVER_PORT, 'GRPC_SERVER_PORT is not defined');
 
   server.bindAsync(
-    `${process.env.RUNNER_HOST}:${process.env.RUNNER_PORT}`,
+    `localhost:${process.env.GRPC_SERVER_PORT}`,
     credentials.createInsecure(), // TODO: Use secure credentials with allow for Coordinator
     (err: Error | null, port: number) => {
       if (err) {