diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc235aa5..aa77fbf4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Get dependencies
       env:
         # renovate: datasource=github-tags depName=golangci/golangci-lint
-        GOLANGCI_LINT_VERSION: v2.5.0
+        GOLANGCI_LINT_VERSION: v2.7.2
       run: |
         curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VERSION}
         curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 19201161..64b334e5 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -50,7 +50,7 @@ jobs:
     - name: Get dependencies
       env:
         # renovate: datasource=github-tags depName=golangci/golangci-lint
-        GOLANGCI_LINT_VERSION: v2.5.0
+        GOLANGCI_LINT_VERSION: v2.7.2
       run: |
         curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VERSION}
         curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
diff --git a/oauthproxy.go b/oauthproxy.go
index c6db18a7..d933d930 100644
--- a/oauthproxy.go
+++ b/oauthproxy.go
@@ -28,7 +28,7 @@ import (
 	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/authentication/basic"
 	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/cookies"
 	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption"
-	proxyhttp "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/http"
+	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/proxyhttp"
 	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/util"
 	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/version"
 
diff --git a/pkg/http/http_suite_test.go b/pkg/proxyhttp/http_suite_test.go
similarity index 99%
rename from pkg/http/http_suite_test.go
rename to pkg/proxyhttp/http_suite_test.go
index 19d4d3ff..4241c7b6 100644
--- a/pkg/http/http_suite_test.go
+++ b/pkg/proxyhttp/http_suite_test.go
@@ -1,4 +1,4 @@
-package http
+package proxyhttp
 
 import (
 	"bytes"
diff --git a/pkg/http/server.go b/pkg/proxyhttp/server.go
similarity index 99%
rename from pkg/http/server.go
rename to pkg/proxyhttp/server.go
index fe76427a..a0fc6054 100644
--- a/pkg/http/server.go
+++ b/pkg/proxyhttp/server.go
@@ -1,4 +1,4 @@
-package http
+package proxyhttp
 
 import (
 	"context"
diff --git a/pkg/http/server_group.go b/pkg/proxyhttp/server_group.go
similarity index 97%
rename from pkg/http/server_group.go
rename to pkg/proxyhttp/server_group.go
index 261d9837..ae690357 100644
--- a/pkg/http/server_group.go
+++ b/pkg/proxyhttp/server_group.go
@@ -1,4 +1,4 @@
-package http
+package proxyhttp
 
 import (
 	"context"
diff --git a/pkg/http/server_group_test.go b/pkg/proxyhttp/server_group_test.go
similarity index 99%
rename from pkg/http/server_group_test.go
rename to pkg/proxyhttp/server_group_test.go
index 74e5c315..261902dc 100644
--- a/pkg/http/server_group_test.go
+++ b/pkg/proxyhttp/server_group_test.go
@@ -1,4 +1,4 @@
-package http
+package proxyhttp
 
 import (
 	"context"
diff --git a/pkg/http/server_test.go b/pkg/proxyhttp/server_test.go
similarity index 99%
rename from pkg/http/server_test.go
rename to pkg/proxyhttp/server_test.go
index 8dfa13af..d97dcec2 100644
--- a/pkg/http/server_test.go
+++ b/pkg/proxyhttp/server_test.go
@@ -1,4 +1,4 @@
-package http
+package proxyhttp
 
 import (
 	"context"
diff --git a/pkg/http/systemd_socket.go b/pkg/proxyhttp/systemd_socket.go
similarity index 98%
rename from pkg/http/systemd_socket.go
rename to pkg/proxyhttp/systemd_socket.go
index b0627f3f..d5f7c49c 100644
--- a/pkg/http/systemd_socket.go
+++ b/pkg/proxyhttp/systemd_socket.go
@@ -1,7 +1,7 @@
 //go:build !windows
 // +build !windows
 
-package http
+package proxyhttp
 
 import (
 	"errors"
diff --git a/pkg/http/systemd_unsupported.go b/pkg/proxyhttp/systemd_unsupported.go
similarity index 95%
rename from pkg/http/systemd_unsupported.go
rename to pkg/proxyhttp/systemd_unsupported.go
index 3fe163f3..b3413cce 100644
--- a/pkg/http/systemd_unsupported.go
+++ b/pkg/proxyhttp/systemd_unsupported.go
@@ -1,7 +1,7 @@
 //go:build windows
 // +build windows
 
-package http
+package proxyhttp
 
 import (
 	"fmt"
diff --git a/providers/provider_default.go b/providers/provider_default.go
index 1735ddd3..dbd93c91 100644
--- a/providers/provider_default.go
+++ b/providers/provider_default.go
@@ -107,6 +107,7 @@ func (p *ProviderData) Redeem(ctx context.Context, redirectURL, code, codeVerifi
 }
 
 // GetEmailAddress returns the Account email address
+//
 // Deprecated: Migrate to EnrichSession
 func (p *ProviderData) GetEmailAddress(_ context.Context, _ *sessions.SessionState) (string, error) {
 	return "", ErrNotImplemented