diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml
index b14cda2..87480ee 100644
--- a/.github/workflows/reviewdog.yml
+++ b/.github/workflows/reviewdog.yml
@@ -8,7 +8,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.13
+          go-version: 1.17
         id: go
       - name: Check out code.
         uses: actions/checkout@v1
diff --git a/Dockerfile b/Dockerfile
index 2522aa1..9854caa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Use the offical Golang image to create a build artifact.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
-FROM golang:1.13.7-alpine as builder
+FROM golang:1.17-alpine3.13 as builder
 RUN apk add --no-cache gcc libc-dev git
 
 ARG version=develop
diff --git a/README.md b/README.md
index 7115148..7cf5ae6 100644
--- a/README.md
+++ b/README.md
@@ -38,10 +38,9 @@ Please always double-check the version of Keptn you are using compared to the ve
 |   0.8.0          | keptncontrib/prometheus-service:0.4.0  |
 |   0.8.1, 0.8.2   | keptncontrib/prometheus-service:0.5.0  |
 |   0.8.1 - 0.8.3  | keptncontrib/prometheus-service:0.6.0  |
-|       0.8.4      | keptncontrib/prometheus-service:0.6.1  |
+|   0.8.4 - 0.8.7  | keptncontrib/prometheus-service:0.6.1  |
 |       0.9.0      | keptncontrib/prometheus-service:0.6.2  |
 
-
 ## Setup Prometheus Monitoring
 
 Keptn doesn't install or manage Prometheus and its components. Users need to install Prometheus and Prometheus Alert manager as a prerequisite.