diff --git a/.drone.yml b/.drone.yml
index 8333e8a..e97f35b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,7 +11,7 @@ trigger:
 
 steps:
   - name: test
-    image: 'elixir:1.21.1'
+    image: 'elixir:1.13.4'
     environemnt:
       POSTGRES_HOST: db
       POSTGRES_USER: postgres
diff --git a/.tool-versions b/.tool-versions
index c391eed..6b61424 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-erlang 24.0.2
-elixir 1.12.1-otp-24
+erlang 24.3.3
+elixir 1.13.4-otp-24
diff --git a/docker-compose.yml b/docker-compose.yml
index e7e8887..e3414c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,5 +12,40 @@ services:
       - './priv/docker/postgres/init.sql:/docker-entrypoint-initdb.d/init.sql'
       - 'db_data:/var/lib/postgresql/data'
     restart: unless-stopped
+  app:
+    image: 'elixir:1.13.4'
+    hostname: app
+    depends_on:
+      - db
+    init: true
+    environment:
+      POSTGRES_HOST: *db_host
+      POSTGRES_USER: *db_user
+      POSTGRES_PASS: *db_pass
+      POSTGRES_NAME: wabanex_dev
+    volumes:
+      - '.:/opt/app'
+      - 'app_build:/opt/app/_build'
+      - 'app_deps:/opt/app/deps'
+    working_dir: /opt/app
+    entrypoint: sleep
+    command: infinity
+  pgcli:
+    image: 'joaodubas/pgcli:latest'
+    hostname: development
+    depends_on:
+      - db
+    environment:
+      PGUSER: *db_user
+      PGPASSWORD: *db_pass
+      PGHOST: *db_host
+      PGDATABASE: wabanex_dev
+    volumes:
+      - './priv/docker/pgcli:/root/.config/pgcli'
+    restart: unless-stopped
+    entrypoint: sleep
+    command: 3650d
 volumes:
   db_data: {}
+  app_build: {}
+  app_deps: {}