diff --git a/packaging/ubuntu-16.04/control b/packaging/ubuntu-16.04/control
index f1eae6da452..fea1ae9face 100644
--- a/packaging/ubuntu-16.04/control
+++ b/packaging/ubuntu-16.04/control
@@ -19,7 +19,7 @@ Build-Depends: autoconf,
                gcc-multilib [amd64],
                gettext,
                gnupg2,
-               golang-go (>=2:1.18~)  [!powerpc] | golang-1.18 [!powerpc],
+               golang-go (>=2:1.18~)  [!powerpc] | golang-1.18 [!powerpc] | golang-1.20,
                grub-common,
                indent,
                init-system-helpers,
diff --git a/packaging/ubuntu-16.04/rules b/packaging/ubuntu-16.04/rules
index f2ca08a9623..7290de4fa1b 100755
--- a/packaging/ubuntu-16.04/rules
+++ b/packaging/ubuntu-16.04/rules
@@ -19,6 +19,11 @@ export DH_GOLANG_GO_GENERATE=1
 export PATH:=${PATH}:${CURDIR}
 # make sure that correct go version is found on xenial
 export PATH:=/usr/lib/go-1.18/bin:${PATH}
+ifneq (,$(filter fips,$(DEB_BUILD_OPTIONS)))
+	# when building with FIPS, use Go 1.20 which is also declared in build
+	# dependencies
+	export PATH:=/usr/lib/go-1.20/bin:${PATH}
+endif
 # GOCACHE is needed by go-1.13+
 export GOCACHE:=/tmp/go-build
 
@@ -91,7 +96,7 @@ ifneq (,$(filter testkeys,$(DEB_BUILD_OPTIONS)))
 	_TAGS := withtestkeys,withbootassetstesting,faultinject
 	_SNAP_TAGS := nomanagers,withtestkeys,faultinject
 else
-	_SNAP_TAGS=-tags nomanagers
+	_SNAP_TAGS=nomanagers
 endif
 
 ifneq (,$(filter fips,$(DEB_BUILD_OPTIONS)))