diff --git a/docs/generated/eventlog.md b/docs/generated/eventlog.md
index 6fbd56367071..160428eed791 100644
--- a/docs/generated/eventlog.md
+++ b/docs/generated/eventlog.md
@@ -238,8 +238,6 @@ An event of type `set_cluster_setting` is recorded when a cluster setting is cha
 Events in this category are generated when a table has been
 marked as audited via `ALTER TABLE ... EXPERIMENTAL_AUDIT SET`.
 
-{% include {{ page.version.version }}/misc/experimental-warning.md %}
-
 Note: These events are not written to `system.eventlog`, even
 when the cluster setting `system.eventlog.enabled` is set. They
 are only emitted via external logging.
diff --git a/pkg/acceptance/compose/gss/psql/Dockerfile b/pkg/acceptance/compose/gss/psql/Dockerfile
index 7f6c47205e9d..592fba058674 100644
--- a/pkg/acceptance/compose/gss/psql/Dockerfile
+++ b/pkg/acceptance/compose/gss/psql/Dockerfile
@@ -1,9 +1,9 @@
 # Build the test binary in a multistage build.
-FROM golang:1.15 AS builder
+FROM golang:1.16 AS builder
 WORKDIR /workspace
 COPY . .
-RUN go get -d -t -tags gss_compose
-RUN go test -v -c -tags gss_compose -o gss.test
+RUN GO111MODULE=off go get -d -t -tags gss_compose
+RUN GO111MODULE=off go test -v -c -tags gss_compose -o gss.test
 
 # Copy the test binary to an image with psql and krb installed.
 FROM postgres:11
diff --git a/pkg/util/log/eventpb/sql_audit_events.pb.go b/pkg/util/log/eventpb/sql_audit_events.pb.go
index bc56c5591a02..87c000801f0b 100644
--- a/pkg/util/log/eventpb/sql_audit_events.pb.go
+++ b/pkg/util/log/eventpb/sql_audit_events.pb.go
@@ -49,7 +49,7 @@ func (m *CommonSQLExecDetails) Reset()         { *m = CommonSQLExecDetails{} }
 func (m *CommonSQLExecDetails) String() string { return proto.CompactTextString(m) }
 func (*CommonSQLExecDetails) ProtoMessage()    {}
 func (*CommonSQLExecDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{0}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{0}
 }
 func (m *CommonSQLExecDetails) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -90,7 +90,7 @@ func (m *SensitiveTableAccess) Reset()         { *m = SensitiveTableAccess{} }
 func (m *SensitiveTableAccess) String() string { return proto.CompactTextString(m) }
 func (*SensitiveTableAccess) ProtoMessage()    {}
 func (*SensitiveTableAccess) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{1}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{1}
 }
 func (m *SensitiveTableAccess) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -127,7 +127,7 @@ func (m *AdminQuery) Reset()         { *m = AdminQuery{} }
 func (m *AdminQuery) String() string { return proto.CompactTextString(m) }
 func (*AdminQuery) ProtoMessage()    {}
 func (*AdminQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{2}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{2}
 }
 func (m *AdminQuery) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -171,7 +171,7 @@ func (m *SlowQuery) Reset()         { *m = SlowQuery{} }
 func (m *SlowQuery) String() string { return proto.CompactTextString(m) }
 func (*SlowQuery) ProtoMessage()    {}
 func (*SlowQuery) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{3}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{3}
 }
 func (m *SlowQuery) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -209,7 +209,7 @@ func (m *CommonLargeRowDetails) Reset()         { *m = CommonLargeRowDetails{} }
 func (m *CommonLargeRowDetails) String() string { return proto.CompactTextString(m) }
 func (*CommonLargeRowDetails) ProtoMessage()    {}
 func (*CommonLargeRowDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{4}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{4}
 }
 func (m *CommonLargeRowDetails) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -248,7 +248,7 @@ func (m *LargeRow) Reset()         { *m = LargeRow{} }
 func (m *LargeRow) String() string { return proto.CompactTextString(m) }
 func (*LargeRow) ProtoMessage()    {}
 func (*LargeRow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{5}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{5}
 }
 func (m *LargeRow) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -289,7 +289,7 @@ func (m *CommonTxnRowsLimitDetails) Reset()         { *m = CommonTxnRowsLimitDet
 func (m *CommonTxnRowsLimitDetails) String() string { return proto.CompactTextString(m) }
 func (*CommonTxnRowsLimitDetails) ProtoMessage()    {}
 func (*CommonTxnRowsLimitDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{6}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{6}
 }
 func (m *CommonTxnRowsLimitDetails) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -329,7 +329,7 @@ func (m *TxnRowsWrittenLimit) Reset()         { *m = TxnRowsWrittenLimit{} }
 func (m *TxnRowsWrittenLimit) String() string { return proto.CompactTextString(m) }
 func (*TxnRowsWrittenLimit) ProtoMessage()    {}
 func (*TxnRowsWrittenLimit) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{7}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{7}
 }
 func (m *TxnRowsWrittenLimit) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -368,7 +368,7 @@ func (m *TxnRowsReadLimit) Reset()         { *m = TxnRowsReadLimit{} }
 func (m *TxnRowsReadLimit) String() string { return proto.CompactTextString(m) }
 func (*TxnRowsReadLimit) ProtoMessage()    {}
 func (*TxnRowsReadLimit) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{8}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{8}
 }
 func (m *TxnRowsReadLimit) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -408,7 +408,7 @@ func (m *SlowQueryInternal) Reset()         { *m = SlowQueryInternal{} }
 func (m *SlowQueryInternal) String() string { return proto.CompactTextString(m) }
 func (*SlowQueryInternal) ProtoMessage()    {}
 func (*SlowQueryInternal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{9}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{9}
 }
 func (m *SlowQueryInternal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -445,7 +445,7 @@ func (m *LargeRowInternal) Reset()         { *m = LargeRowInternal{} }
 func (m *LargeRowInternal) String() string { return proto.CompactTextString(m) }
 func (*LargeRowInternal) ProtoMessage()    {}
 func (*LargeRowInternal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{10}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{10}
 }
 func (m *LargeRowInternal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -486,7 +486,7 @@ func (m *TxnRowsWrittenLimitInternal) Reset()         { *m = TxnRowsWrittenLimit
 func (m *TxnRowsWrittenLimitInternal) String() string { return proto.CompactTextString(m) }
 func (*TxnRowsWrittenLimitInternal) ProtoMessage()    {}
 func (*TxnRowsWrittenLimitInternal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{11}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{11}
 }
 func (m *TxnRowsWrittenLimitInternal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -526,7 +526,7 @@ func (m *TxnRowsReadLimitInternal) Reset()         { *m = TxnRowsReadLimitIntern
 func (m *TxnRowsReadLimitInternal) String() string { return proto.CompactTextString(m) }
 func (*TxnRowsReadLimitInternal) ProtoMessage()    {}
 func (*TxnRowsReadLimitInternal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{12}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{12}
 }
 func (m *TxnRowsReadLimitInternal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -563,7 +563,7 @@ func (m *QueryExecute) Reset()         { *m = QueryExecute{} }
 func (m *QueryExecute) String() string { return proto.CompactTextString(m) }
 func (*QueryExecute) ProtoMessage()    {}
 func (*QueryExecute) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sql_audit_events_88629882eceada2e, []int{13}
+	return fileDescriptor_sql_audit_events_f9d70849220b705b, []int{13}
 }
 func (m *QueryExecute) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -3637,10 +3637,10 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("util/log/eventpb/sql_audit_events.proto", fileDescriptor_sql_audit_events_88629882eceada2e)
+	proto.RegisterFile("util/log/eventpb/sql_audit_events.proto", fileDescriptor_sql_audit_events_f9d70849220b705b)
 }
 
-var fileDescriptor_sql_audit_events_88629882eceada2e = []byte{
+var fileDescriptor_sql_audit_events_f9d70849220b705b = []byte{
 	// 914 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0x41, 0x6f, 0xe3, 0x44,
 	0x14, 0x8e, 0x9d, 0xb6, 0xb1, 0x5f, 0xb6, 0xb0, 0x98, 0xae, 0xe4, 0x2d, 0x22, 0x8e, 0x7c, 0xd9,
diff --git a/pkg/util/log/eventpb/sql_audit_events.proto b/pkg/util/log/eventpb/sql_audit_events.proto
index 561039c6325f..f51ad24035ea 100644
--- a/pkg/util/log/eventpb/sql_audit_events.proto
+++ b/pkg/util/log/eventpb/sql_audit_events.proto
@@ -50,8 +50,6 @@ message CommonSQLExecDetails {
 // Events in this category are generated when a table has been
 // marked as audited via `ALTER TABLE ... EXPERIMENTAL_AUDIT SET`.
 //
-// {% include {{ page.version.version }}/misc/experimental-warning.md %}
-//
 // Note: These events are not written to `system.eventlog`, even
 // when the cluster setting `system.eventlog.enabled` is set. They
 // are only emitted via external logging.
diff --git a/pkg/util/log/logconfig/config.go b/pkg/util/log/logconfig/config.go
index 932bf5c57934..4901868f0079 100644
--- a/pkg/util/log/logconfig/config.go
+++ b/pkg/util/log/logconfig/config.go
@@ -18,8 +18,8 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/util/log/logpb"
 	"github.com/cockroachdb/errors"
-	"github.com/dustin/go-humanize"
-	"gopkg.in/yaml.v2"
+	humanize "github.com/dustin/go-humanize"
+	yaml "gopkg.in/yaml.v2"
 )
 
 // DefaultFileFormat is the entry format for file sinks when not