diff --git a/.gitignore b/.gitignore
index 2d26378..9e57a0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 .idea
 .env
 .env.*
+.cache/
+vendor/
 
 !.env.sample
 config/config.yml
diff --git a/Dockerfile.development b/Dockerfile.development
index ca0369c..ebd17ec 100644
--- a/Dockerfile.development
+++ b/Dockerfile.development
@@ -1,5 +1,8 @@
 FROM golang:1.13-alpine AS pososyamba
 
+ENV GOPATH /application/vendor
+ENV HOME /application
+
 WORKDIR /application
 
 RUN apk update && apk upgrade && \
@@ -11,7 +14,3 @@ COPY go.sum .
 RUN go mod download
 
 COPY . .
-
-RUN go build ./cmd/pososyamba_bot/main.go
-
-CMD [ "./main" ]
diff --git a/Makefile b/Makefile
index c14599d..91b792b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,30 @@
-run_development:
-	docker-compose run --rm bot bash
+UID=$(shell id -u)
+USRENAME=`id -un`
+USER_PARAM=--user $(shell id -u):$(shell id -g)
+APP_VOLUME_PARAM=-v `pwd`/.:/application
+APP_PORT_PARAM=-p 80:3000/tcp
+CONTAINER_NAME=thesunwave/pososyamba:latest
+DOCKER_RUN=docker run -it ${USER_PARAM} ${APP_VOLUME_PARAM} ${APP_PORT_PARAM} ${CONTAINER_NAME}
+DOCKER_COMPOSE_RUN=docker-compose run  ${USER_PARAM}  bot
 
-build: Dockerfile
+build_prod: Dockerfile
 	docker build --rm -f "Dockerfile" -t thesunwave/pososyamba:latest .
 
-run:
-	docker run --env-file .env.development pososyamba:latest
+run_prod: build_image
+	${DOCKER_RUN}--env-file .env.development
+
+clean:
+	rm -f ./main
+
+build_devel: clean
+	${DOCKER_COMPOSE_RUN} /bin/sh -c "go build -work /application/cmd/pososyamba_bot/main.go"
+	chmod a+x ./main
+
+up: build_devel
+	docker-compose up
+
+down:
+	docker-compose down
+
+sh:
+	${DOCKER_COMPOSE_RUN} /bin/bash -l
diff --git a/docker-compose.yml b/docker-compose.yml
index bd2e670..d18e0ba 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.development
-    command: sh -c "go build /application/cmd/pososyamba_bot/main.go && /application/main"
+    command: /application/main
     depends_on:
       - redis
     env_file: