diff --git a/Dockerfile b/Dockerfile
index 3100787286baee08e0c26165c2be26be0f43b1ee..d37890d989423f0e357a791d36847a630216bd3d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,4 +16,7 @@ WORKDIR /root/
 COPY --from=base /root/config ./config
 COPY --from=base /root/main ./
 
+ARG VERSION
+ENV VERSION=$VERSION
+
 ENTRYPOINT ["./main"]
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..a7cbf59eadc4e21d6b03a3ac1c43e7b50d59732c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+# Makefile
+TAG := $(shell git describe --tags)
+VERSION := $(shell git describe --tags)
+
+dist:
+	sudo TAG=${TAG} VERSION=${VERSION} docker-compose build
+	sudo TAG=${TAG} VERSION=${VERSION} docker-compose push
+
+dist-latest: dist
+	sudo VERSION=${VERSION} docker-compose build
+	sudo VERSION=${VERSION} docker-compose push
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..30d27e85b0d06e7bb70115b33260bf5a37cedd65
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,10 @@
+# docker-compose.yml
+version: '3'
+
+services:
+  app:
+    build: 
+      context: .
+      args:
+        VERSION: ${VERSION:-unknown}
+    image: docker.registry.dawn.int:5000/dawn/dawn-gdd:${TAG:-latest}
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 383f05f15d1644dccca08e8c6bfcd6abafc04994..327dde04edb1b0063f7968a69bb68180ffd1b63f 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/spf13/viper v1.9.0
 	github.com/stretchr/testify v1.7.0
 	github.com/swaggo/swag v1.8.6
-	github.com/tgs266/dawn-go-common v0.0.0-20221206030504-5f380b46dded
+	github.com/tgs266/dawn-go-common v0.0.0-20230224224350-be1632a4985f
 	go.mongodb.org/mongo-driver v1.7.3
 	gonum.org/v1/gonum v0.9.3
 )
diff --git a/go.sum b/go.sum
index 16ca9c58211790552145b66c5cbd541be1dade81..b44f09fa60844fdd014329bb1b52198b224b53ac 100644
--- a/go.sum
+++ b/go.sum
@@ -460,6 +460,8 @@ github.com/tgs266/dawn-go-common v0.0.0-20221205185728-2a3bf79effee h1:xj6dQOrNY
 github.com/tgs266/dawn-go-common v0.0.0-20221205185728-2a3bf79effee/go.mod h1:6beeKsmO0CLGRQj/mCk5jqvocsHqr76n5u4NAGmz5w8=
 github.com/tgs266/dawn-go-common v0.0.0-20221206030504-5f380b46dded h1:mI0dR/ji2qIlYBDBj8KZEwycwEv81cuWUT0VQBRMDAQ=
 github.com/tgs266/dawn-go-common v0.0.0-20221206030504-5f380b46dded/go.mod h1:gRZb/gtB9UhxUxfdbPyyUDikyNAksVyPohqOrCOLEqE=
+github.com/tgs266/dawn-go-common v0.0.0-20230224224350-be1632a4985f h1:PPtCsB06pJkzglJKaItKGp0oag41E3Tx913vC+E7XZQ=
+github.com/tgs266/dawn-go-common v0.0.0-20230224224350-be1632a4985f/go.mod h1:ndRiFDc7B2sCbvVX78Q1UPKMa7Y6CVjy+Hpp1ge9TQg=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/undefinedlabs/go-mpatch v1.0.6 h1:h8q5ORH/GaOE1Se1DMhrOyljXZEhRcROO7agMqWXCOY=