diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 77a05b14..33e27748 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.14.x]
+        go-version: [1.16.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -34,12 +34,9 @@ jobs:
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
           version: v1.40.1
-
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
-
           # Optional: golangci-lint command line arguments.
           #args: --new-from-rev=f7cdb31b6a6c8
-
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true
diff --git a/Makefile b/Makefile
index 4f62f802..58f58898 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,9 @@ endif
 GO ?= go
 VERSION ?= $(shell git rev-parse --short HEAD)
 
-# Binaries
 PKG_CARBONAPI=github.com/bookingcom/carbonapi/cmd/carbonapi
 PKG_CARBONZIPPER=github.com/bookingcom/carbonapi/cmd/carbonzipper
 
-# Flags
 GCFLAGS :=
 debug: GCFLAGS += -gcflags=all='-l -N'
 
@@ -21,7 +19,8 @@ LDFLAGS = -ldflags '-X main.BuildVersion=$(VERSION)'
 TAGS := -tags cairo
 nocairo: TAGS =
 
-# Targets
+### Targets ###
+
 all: build
 
 nocairo: build
diff --git a/docker/carbonapi/Dockerfile b/docker/carbonapi/Dockerfile
index fbdf53f2..6ab36217 100644
--- a/docker/carbonapi/Dockerfile
+++ b/docker/carbonapi/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14
+FROM golang:1.16
 
 RUN apt-get update
 RUN apt-get install -y libcairo2-dev
diff --git a/docker/nanotube/Dockerfile b/docker/nanotube/Dockerfile
index 04224cff..272de0e8 100644
--- a/docker/nanotube/Dockerfile
+++ b/docker/nanotube/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14
+FROM golang:1.16
 
 RUN go get github.com/bookingcom/nanotube/cmd/nanotube
 RUN go install github.com/bookingcom/nanotube/cmd/nanotube
diff --git a/docker/zipper/Dockerfile b/docker/zipper/Dockerfile
index 752268f3..169cce2d 100644
--- a/docker/zipper/Dockerfile
+++ b/docker/zipper/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14
+FROM golang:1.16
 
 RUN apt-get update
 RUN apt-get install -y libcairo2-dev
diff --git a/go.mod b/go.mod
index d9c34b92..bda68607 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/bookingcom/carbonapi
 
-go 1.14
+go 1.16
 
 require (
 	bitbucket.org/tebeka/strftime v0.0.0-20121209190902-af5e0ef38369