diff --git a/Dockerfile b/Dockerfile
index b96ab17..0823f3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,10 @@ RUN cd ${REPO} && go get && go build
 # Copy the binary to the second image
 FROM alpine:latest
 
+LABEL source="https://github.com/status-im/p2p-health-bot"
+LABEL description="This bot measures latency for Status messages (complete roundtrip)."
+LABEL maintainer="ivand@status.im"
+
 RUN apk add --no-cache ca-certificates bash
 
 ENV REPO=/go/src/github.com/status-im/p2p-health-bot
diff --git a/Makefile b/Makefile
index 426c301..e14d6c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,9 @@
+COMMIT = $(shell git rev-parse --short HEAD)
+IMAGE_NAME = 'statusteam/p2p-health-bot'
+
 all: docker-image
 
 docker-image:
-	docker build -t statusteam/p2p-health-bot .
+	docker build . \
+		-t $(IMAGE_NAME):$(COMMIT) \
+		-t $(IMAGE_NAME):latest