diff --git a/api/go.mod b/api/go.mod
index 82a130f3c..bfafa47fa 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -1,6 +1,6 @@
 module github.com/portainer/portainer/api
 
-go 1.13
+go 1.16
 
 require (
 	github.com/Microsoft/go-winio v0.4.16
diff --git a/build/linux/toolkit.Dockerfile b/build/linux/toolkit.Dockerfile
index 1f7938df3..dc3f901a2 100644
--- a/build/linux/toolkit.Dockerfile
+++ b/build/linux/toolkit.Dockerfile
@@ -10,28 +10,28 @@ WORKDIR /src/portainer
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
 # Set default go version
-ARG GO_VERSION=go1.13.11.linux-amd64
+ARG GO_VERSION=go1.16.6.linux-amd64
 
 # Install packages
 RUN apt-get update --fix-missing && apt-get install -qq \
-    dialog \
-    apt-utils \
-    curl \
-    build-essential \
-    nodejs \
-    git \
-    wget
+	dialog \
+	apt-utils \
+	curl \
+	build-essential \
+	nodejs \
+	git \
+	wget
 
 # Install Yarn
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-    && apt-get update && apt-get -y install yarn
+	&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+	&& apt-get update && apt-get -y install yarn
 
 # Install Golang
 RUN cd /tmp \
-    && wget -q https://dl.google.com/go/${GO_VERSION}.tar.gz \
-    && tar -xf ${GO_VERSION}.tar.gz \
-    && mv go /usr/local
+	&& wget -q https://dl.google.com/go/${GO_VERSION}.tar.gz \
+	&& tar -xf ${GO_VERSION}.tar.gz \
+	&& mv go /usr/local
 
 # Configure Go
 ENV PATH "$PATH:/usr/local/go/bin"