diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8448101f..3ffcb5d8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -28,6 +28,8 @@ jobs:
     - uses: actions/checkout@v2
 
     - uses: actions/setup-go@v2
+      with:
+        go-version: "1.16"
 
     - run: |
         go mod download
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4a8596bf..a04927e9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
 
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.15"
+        go-version: "1.16"
 
     - run: sudo apt-get install -y --no-install-recommends ffmpeg
 
diff --git a/Makefile b/Makefile
index 1be10f2f..fb411944 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-BASE_IMAGE = golang:1.15-alpine3.12
+BASE_IMAGE = golang:1.16-alpine3.13
 LINT_IMAGE = golangci/golangci-lint:v1.38.0
 
 .PHONY: $(shell ls)
diff --git a/README.md b/README.md
index 403ba0cf..611b6276 100644
--- a/README.md
+++ b/README.md
@@ -557,7 +557,7 @@ Args:
 
 ### Compile and run from source
 
-Install Go 1.15, download the repository, open a terminal in it and run:
+Install Go 1.16, download the repository, open a terminal in it and run:
 
 ```
 go run .
diff --git a/bench/proxy/Dockerfile b/bench/proxy/Dockerfile
index 5269346d..3f554412 100644
--- a/bench/proxy/Dockerfile
+++ b/bench/proxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15-alpine3.12
+FROM golang:1.16-alpine3.12
 
 RUN apk add --no-cache \
     ffmpeg
diff --git a/bench/publish/Dockerfile b/bench/publish/Dockerfile
index 24ec9f08..2f355554 100644
--- a/bench/publish/Dockerfile
+++ b/bench/publish/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15-alpine3.12
+FROM golang:1.16-alpine3.12
 
 RUN apk add --no-cache \
     ffmpeg
diff --git a/bench/read/Dockerfile b/bench/read/Dockerfile
index 25abb09a..50427c0f 100644
--- a/bench/read/Dockerfile
+++ b/bench/read/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15-alpine3.12
+FROM golang:1.16-alpine3.12
 
 RUN apk add --no-cache \
     ffmpeg
diff --git a/go.mod b/go.mod
index 6dc12b1b..d9534a27 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/aler9/rtsp-simple-server
 
-go 1.15
+go 1.16
 
 require (
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect