diff --git a/conf/go.arm.src b/conf/go.arm.src
index 08921fe..70de873 100644
--- a/conf/go.arm.src
+++ b/conf/go.arm.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://golang.org/dl/go1.16.3.linux-armv6l.tar.gz
-SOURCE_SUM=0dae30385e3564a557dac7f12a63eedc73543e6da0f6017990e214ce8cc8797c
+SOURCE_URL=https://golang.org/dl/go1.16.4.linux-armv6l.tar.gz
+SOURCE_SUM=a53391a800ddec749ee90d38992babb27b95cfb864027350c737b9aa8e069494
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/go.arm64.src b/conf/go.arm64.src
index 2ccc1ff..56528d1 100644
--- a/conf/go.arm64.src
+++ b/conf/go.arm64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://golang.org/dl/go1.16.3.linux-arm64.tar.gz
-SOURCE_SUM=566b1d6f17d2bc4ad5f81486f0df44f3088c3ed47a3bec4099d8ed9939e90d5d
+SOURCE_URL=https://golang.org/dl/go1.16.4.linux-arm64.tar.gz
+SOURCE_SUM=8b18eb05ddda2652d69ab1b1dd1f40dd731799f43c6a58b512ad01ae5b5bba21
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/go.i386.src b/conf/go.i386.src
index 3563edf..317791b 100644
--- a/conf/go.i386.src
+++ b/conf/go.i386.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://golang.org/dl/go1.16.3.linux-386.tar.gz
-SOURCE_SUM=48b2d1481db756c88c18b1f064dbfc3e265ce4a775a23177ca17e25d13a24c5d
+SOURCE_URL=https://golang.org/dl/go1.16.4.linux-386.tar.gz
+SOURCE_SUM=cd1b146ef6e9006f27dd99e9687773e7fef30e8c985b7d41bff33e955a3bb53a
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/go.x86-64.src b/conf/go.x86-64.src
index 1d743f9..d69f27c 100644
--- a/conf/go.x86-64.src
+++ b/conf/go.x86-64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://golang.org/dl/go1.16.3.linux-amd64.tar.gz
-SOURCE_SUM=951a3c7c6ce4e56ad883f97d9db74d3d6d80d5fec77455c6ada6c1f7ac4776d2
+SOURCE_URL=https://golang.org/dl/go1.16.4.linux-amd64.tar.gz
+SOURCE_SUM=7154e88f5a8047aad4b80ebace58a059e36e7e2e4eb3b383127a28c711b4ff59
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 88456eb..d11ff6a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,7 +5,7 @@
     "description": {
         "en": "Offers a user experience similar to virtual machines but using Linux containers instead."
     },
-    "version": "4.14~ynh1",
+    "version": "4.14~ynh2",
     "url": "https://example.com",
     "license": "Apache-2.0",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index bdc3cd8..b96e1c1 100755
--- a/scripts/install
+++ b/scripts/install
@@ -14,6 +14,8 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 ynh_clean_setup () {
+	ynh_exec_warn_less popd
+
 	ynh_secure_remove --file="$go_tmp"
 	ynh_secure_remove --file="$lxd_tmp"
 }
@@ -70,9 +72,6 @@ export LD_LIBRARY_PATH="${GOPATH}/deps/raft/.libs/:${GOPATH}/deps/dqlite/.libs/"
 export CGO_LDFLAGS_ALLOW="-Wl,-wrap,pthread_create"
 cd $GOPATH/src/github.com/lxc/lxd
 
-# https://github.com/golang/go/issues/31997#issuecomment-782864390
-go env -w GO111MODULE=auto
-
 ynh_exec_warn_less make
 
 mkdir -p /usr/local/lib/$app
diff --git a/scripts/upgrade b/scripts/upgrade
index 0bc4f3a..a738055 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -31,6 +31,8 @@ ynh_script_progression --message="Backing up the app before upgrading (may take
 # Backup the current version of the app
 ynh_backup_before_upgrade
 ynh_clean_setup () {
+	ynh_exec_warn_less popd
+
 	ynh_secure_remove --file="$go_tmp"
 	ynh_secure_remove --file="$lxd_tmp"
 	# Restore it if the upgrade fails
@@ -85,9 +87,6 @@ export LD_LIBRARY_PATH="${GOPATH}/deps/raft/.libs/:${GOPATH}/deps/dqlite/.libs/"
 export CGO_LDFLAGS_ALLOW="-Wl,-wrap,pthread_create"
 cd $GOPATH/src/github.com/lxc/lxd
 
-# https://github.com/golang/go/issues/31997#issuecomment-782864390
-go env -w GO111MODULE=auto
-
 ynh_exec_warn_less make
 
 mkdir -p /usr/local/lib/$app