diff --git a/.run/go build smart-bot.run.xml b/.run/go build smart-bot.run.xml
index 610c48d..a327a6b 100644
--- a/.run/go build smart-bot.run.xml	
+++ b/.run/go build smart-bot.run.xml	
@@ -16,7 +16,7 @@
     <kind value="PACKAGE" />
     <package value="golang-app" />
     <directory value="$PROJECT_DIR$" />
-    <output_directory value="$PROJECT_DIR$/build" />
+    <output_directory value="$PROJECT_DIR$/bin" />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.run/go test smart-bot.run.xml b/.run/go test application.run.xml
similarity index 93%
rename from .run/go test smart-bot.run.xml
rename to .run/go test application.run.xml
index 476221d..e33d0c8 100644
--- a/.run/go test smart-bot.run.xml	
+++ b/.run/go test application.run.xml	
@@ -1,6 +1,5 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="go test application" type="GoTestRunConfiguration" factoryName="Go Test">
-    <module name="smart-bot" />
     <working_directory value="$PROJECT_DIR$" />
     <EXTENSION ID="net.ashald.envfile">
       <option name="IS_ENABLED" value="true" />
@@ -13,11 +12,11 @@
         <ENTRY IS_ENABLED="true" PARSER="env" PATH=".env" />
       </ENTRIES>
     </EXTENSION>
-    <framework value="gotest" />
     <kind value="DIRECTORY" />
-    <package value="smart-bot" />
+    <package value="golang-app" />
     <directory value="$PROJECT_DIR$" />
     <filePath value="$PROJECT_DIR$" />
+    <framework value="gotest" />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 2281b0e..999b112 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ RUN go mod download
 COPY . .
 
 # Build the application
-RUN go build -ldflags "-s -w" -o /bin/app .
+RUN go build -ldflags "-s -w" -o bin/app .
 
 FROM scratch
 
@@ -35,7 +35,7 @@ WORKDIR /
 
 # Copy binary from build to main folder
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /bin/app app
+COPY --from=builder /source/bin/app app
 
 # Copy some application assets
 #COPY --from=builder /source/deploy/docker/environment.sh ./deploy/docker/environment.sh
diff --git a/Makefile b/Makefile
index 19c1fd9..9d6d715 100644
--- a/Makefile
+++ b/Makefile
@@ -18,4 +18,4 @@ build:
 
 run:
 	make build-backoffice-gateway
-	./build/app
+	./bin/app
diff --git a/README.md b/README.md
index 5840047..28dda5f 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,12 @@ cp .env.dist .env
 #### Build application
 ``` shell
 go mod tidy
-go build -ldflags "-s -w" -o build/app .
+go build -ldflags "-s -w" -o bin/app .
 ```
 
 #### Run application
 ``` shell
-env $(cat .env|xargs) ./build/app
+env $(cat .env|xargs) ./bin/app
 ```
 
 #### Test application