diff --git a/docker/Dockerfile b/docker/Dockerfile
index 55d9518..5ab06bd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,6 +5,8 @@ RUN rm -rf /app/*
 
 COPY ./package.json .
 COPY ./yarn.lock .
+COPY ./docker/wait-for-it.sh .
+
 RUN yarn
 COPY . .
 RUN yarn build
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 95d9b35..d8eb9ef 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   db:
-    container_name: bot-db
+    container_name: bot-db-${DRONE_BRANCH}
     image: postgres:11-alpine
     environment:
       POSTGRES_USER: user
@@ -11,6 +11,7 @@ services:
       - bot-db:/var/lib/postgresql/data
       - /etc/localtime:/etc/localtime:ro
   app:
+    container_name: bot-app-${DRONE_BRANCH}
     restart: always
     environment:
       PORT: 80