diff --git a/.dockerignore b/.dockerignore
index 9e42f3fe5..a9b826f7e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,5 @@
 .idea
+.dev
 build
 codegen
 var
diff --git a/Dockerfile b/Dockerfile
index 661a42c11..09ce7d9bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,11 @@
 # build stage
-FROM golang:1.16-alpine as build-stage
+FROM golang:1.16-buster as build-stage
 
 ENV GOFLAGS='-mod=readonly'
 ENV BUILD_OS=linux
 ENV BUILD_ARCH=amd64
 ENV BUILD_VERSION=latest
 
-RUN apk add build-base --no-cache
-
 WORKDIR /corteza
 
 COPY . ./
@@ -16,7 +14,7 @@ RUN make release-clean release
 
 
 # deploy stage
-FROM alpine:3
+FROM ubuntu:20.04
 
 ENV STORAGE_PATH "/data"
 ENV CORREDOR_ADDR "corredor:80"