diff --git a/.dockerignore b/.dockerignore
index d54d746..dc87b67 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,9 +1,44 @@
 .git
-/bin/
-/.shards/
-/spec/
-/sqlite/
+.gitignore
+.github
 
+/bin/
+/bit
+/cli
+/benchmark
+*.dwarf
+*.o
+*.a
+
+# Dependencies cache
+/.shards/
+/lib/.shards/
+
+/spec/
+
+# Database files (should be mounted as volumes)
+/sqlite/
+*.db
+*.db-shm
+*.db-wal
+
+# Logs and temporary files
+*.log
+
+# Documentation
 /docs/
-benchmark.cr
+*.md
+README.md
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md
+LICENSE
+DOCKER_MIGRATION.md
+
+# Development environment
 .env*
+.editorconfig
+
+# Docker files (not needed inside image)
+Dockerfile
+docker-compose.yml
+.dockerignore
diff --git a/.gitignore b/.gitignore
index 15eabab..af87c78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 
 *.log
 bit
+cli
diff --git a/README.md b/README.md
index fa38fb7..d3d56d0 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 - Includes `X-Forwarded-For` header.
 - Multiple users are supported via API key authentication. Create, list and delete keys via the [CLI](docs/SETUP.md#cli).
 - Easy to extend, Ruby on Rails inspired setup.
-- Auto update UA regexes and GeoLite2 database
+- Auto update UA regexes and GeoLite2 database.
 
 ## Why bit?
 
@@ -22,7 +22,7 @@
 
 ## Run It Anywhere
 
-Images available on [Docker Hub](https://hub.docker.com/r/sjdonado/bit/tags).
+All images available on [Docker Hub](https://hub.docker.com/r/sjdonado/bit/tags).
 
 ### Docker
 
diff --git a/cli b/cli
deleted file mode 100755
index 404df7a..0000000
Binary files a/cli and /dev/null differ
diff --git a/docs/openapi.yaml b/docs/openapi.yaml
index bc70f5b..8b1b56a 100644
--- a/docs/openapi.yaml
+++ b/docs/openapi.yaml
@@ -13,7 +13,7 @@ info:
     Multiple users are supported via `X-Api-Key` headers. Create, list and delete keys via the [CLI](https://github.com/sjdonado/bit/blob/master/SETUP.md#cli).
   version: 1.6.0
   contact:
-    name: Juan Rodriguez Donado
+    name: sjdonado
     url: https://sjdonado.com
 
 servers: