diff --git a/Dockerfile b/Dockerfile
index c0222f24..0f33f938 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.3-alpine as build
+FROM golang:1.17.5-alpine3.15 as build
 WORKDIR /src/prometheus-kafka-adapter
 
 COPY go.mod go.sum vendor *.go ./
@@ -8,7 +8,7 @@ ADD . /src/prometheus-kafka-adapter
 RUN apk add --no-cache gcc musl-dev
 RUN go build -ldflags='-w -s -extldflags "-static"' -tags musl,static,netgo -mod=vendor -o /prometheus-kafka-adapter
 
-FROM alpine:3.14
+FROM alpine:3.15
 
 COPY schemas/metric.avsc /schemas/metric.avsc
 COPY --from=build /prometheus-kafka-adapter /
diff --git a/Makefile b/Makefile
index f330199c..a7900a41 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ test:
 	docker run --rm -v $(CURDIR):/app:z -w /app golang:$(MUSL_GO_VER) sh tools/testscript.sh vet
 	docker run --rm -v $(CURDIR):/app:z -w /app golang:$(MUSL_GO_VER) sh tools/testscript.sh test
 
-build: build-libc build-musl
+build: build-libc build-musl build-docker-image
 
 build-libc:
 	docker run --rm -v $(CURDIR):/app:z -w /app golang:$(LIBC_GO_VER) sh tools/buildscript.sh $(NAME)
@@ -21,6 +21,9 @@ build-libc:
 build-musl:
 	docker run --rm -v $(CURDIR):/app:z -w /app golang:$(MUSL_GO_VER) sh tools/buildscript.sh $(NAME)
 
+build-docker-image:
+	docker build -t telefonica/prometheus-kafka-adapter:latest .
+
 vendor-update:
 	rm -rf go.mod go.sum vendor/
 	docker run --rm -v $(CURDIR):/app:z -w /app golang:$(MUSL_GO_VER) go mod init $(PACKAGE_NAME)
diff --git a/README.md b/README.md
index cd741ddf..b2ecb6c2 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ The Avro-JSON serialization is the same. See the [Avro schema](./schemas/metric.
 
 ### prometheus-kafka-adapter
 
-There is a docker image `telefonica/prometheus-kafka-adapter:1.7.0` [available on Docker Hub](https://hub.docker.com/r/telefonica/prometheus-kafka-adapter/).
+There is a docker image `telefonica/prometheus-kafka-adapter:1.8.0` [available on Docker Hub](https://hub.docker.com/r/telefonica/prometheus-kafka-adapter/).
 
 Prometheus-kafka-adapter listens for metrics coming from Prometheus and sends them to Kafka. This behaviour can be configured with the following environment variables: