diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 0913226..061eb89 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -3,6 +3,9 @@ FROM		scratch
 
 MAINTAINER Michele Fadda "<mikif70@gmail.com>"
 
-COPY        lastlogin_mongodb-v4.4.1b /bin/lastlogin_mongodb
+ARG VER
+ENV VER ${VER:-0.0.0}
+
+COPY        lastlogin_mongodb-${VER} /bin/lastlogin_mongodb
 
 ENTRYPOINT  [ "/bin/lastlogin_mongodb" ]
diff --git a/Docker/build.sh b/Docker/build.sh
index 2bb71cd..f4beae2 100755
--- a/Docker/build.sh
+++ b/Docker/build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker build -t mikif70/llmongo:4.4.1b .
+docker build -t mikif70/llmongo:$(git -C .. describe --tags) -t repo.ism.tiscali.sys:5000/mikif70/llmongo:$(git -C .. describe --tags) --build-arg VER=$(git -C .. describe --tags) .
diff --git a/build.sh b/build.sh
index dca2789..9cf0267 100755
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo .
+CGO_ENABLED=0 GOOS=linux go build -o lastlogin_mongodb-$(git describe --tags) -a -installsuffix cgo .
+
+mv lastlogin_mongodb-$(git describe --tags) Docker/
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
new file mode 100644
index 0000000..67eeacb
--- /dev/null
+++ b/docker-compose/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '2'
+services:
+  mongodb:
+    image: mikif70/mongodb:3.4.7
+    ports:
+      - 27017:27017
+    container_name: ll_mongod
+    volumes:
+      -  ./mongod:/data
+    depends_on:
+      - redis
+  redis:
+    image: "redis:alpine"
+    container_name: ll_redis
+    ports:
+      - 6379:6379
+    volumes:
+      - ./redis:/data
\ No newline at end of file
diff --git a/docker-compose/mongo.sh b/docker-compose/mongo.sh
new file mode 100755
index 0000000..4c17756
--- /dev/null
+++ b/docker-compose/mongo.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ -z $1 ]; then
+        HOST=192.168.0.1:27017
+else
+        HOST=${1}
+fi
+
+docker run --rm -it mikif70/mongotools:3.4.7 mongo ${HOST}
diff --git a/docker-compose/test.sh b/docker-compose/test.sh
new file mode 100755
index 0000000..1b5ede3
--- /dev/null
+++ b/docker-compose/test.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+docker run \
+        --rm \
+        -v /opt/WORK/PROJECTS/New_Mail/lastlogin_mongodb/docker-compose/llmongo:/data \
+        --name llmongo \
+        mikif70/llmongo:4.4.0 \
+                -l /data/llmongo.log \
+                -r 192.168.0.1:6379 \
+                -m 192.168.0.1:27017 \
+                -d lastlogin \
+                -T 80s \
+		-D \
+                $@