diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cf69199b..bd5b448f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16.0
 
       - name: Check out code
         uses: actions/checkout@v2
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 05bf894c..e5421052 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16.0
 
       - name: Check out code
         uses: actions/checkout@v2
@@ -99,7 +99,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16.0
 
       - name: Check out code
         uses: actions/checkout@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index abd8bf8e..7f57451e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].
 
+## v4.1.0
+
+### Changed
+
+- Go version updated from `1.15.7` up to `1.16.0`
+
 ## v4.0.1
 
 ### Fixed
diff --git a/Dockerfile b/Dockerfile
index 26046d42..3ad1bbf6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.2
 
 # Image page: <https://hub.docker.com/_/golang>
-FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.15.7-alpine as builder
+FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.16.0-alpine as builder
 
 # can be passed with any prefix (like `v1.2.3@GITHASH`)
 # e.g.: `docker build --build-arg "APP_VERSION=v1.2.3@GITHASH" .`
diff --git a/docker-compose.yml b/docker-compose.yml
index 3c25043f..c5230f9d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,21 +5,18 @@ volumes:
   redis-data:
   golint-cache:
 
-x-app: &app-service # application service template
-  image: golang:1.15-buster # Image page: <https://hub.docker.com/_/golang>
-  working_dir: /src
-  environment:
-    HOME: /tmp
-    GOPATH: /tmp
-  volumes:
-    - /etc/passwd:/etc/passwd:ro
-    - /etc/group:/etc/group:ro
-    - .:/src:rw
-    - tmp-data:/tmp:rw
-
 services:
-  app:
-    <<: *app-service
+  app: &app-service
+    image: golang:1.16.0-buster # Image page: <https://hub.docker.com/_/golang>
+    working_dir: /src
+    environment:
+      HOME: /tmp
+      GOPATH: /tmp
+    volumes:
+      - /etc/passwd:/etc/passwd:ro
+      - /etc/group:/etc/group:ro
+      - .:/src:rw
+      - tmp-data:/tmp:rw
 
   web:
     <<: *app-service
diff --git a/pkg/hostsfile/parser.go b/pkg/hostsfile/parser.go
index 24f8f3ef..5dccc52b 100644
--- a/pkg/hostsfile/parser.go
+++ b/pkg/hostsfile/parser.go
@@ -9,7 +9,7 @@ import (
 
 // Hostname validator generation (execute in linux shell) using <https://gitlab.com/opennota/re2dfa>:
 //	$ cd ./pkg/hostsfile
-//	$ docker run --rm -ti -v $(pwd):/rootfs:rw -w /rootfs golang:1.15-buster
+//	$ docker run --rm -ti -v $(pwd):/rootfs:rw -w /rootfs golang:1.16-buster
 //	$ go get -u gitlab.com/opennota/re2dfa
 //	$ re2dfa -o hostname_validator.go \
 //	'(?i)^((-?)(xn--|_)?[a-z0-9-_]{0,61}[a-z0-9-_]\.)*(xn--)?([a-z0-9][a-z0-9\-]{0,60}|[a-z0-9-]{1,30}\.[a-z]{2,})$' \