diff --git a/.golangci.yml b/.golangci.yml
index b2c2f64..1eb377f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -23,7 +23,7 @@ linters-settings:
       See the License for the specific language governing permissions and
       limitations under the License.
   goimports:
-    local-prefixes: code.cacert.org/cacert/oidc_idp
+    local-prefixes: code.cacert.org/cacert/oidc-idp
   misspell:
     locale: "US"
     ignore-words:
diff --git a/cmd/idp/main.go b/cmd/idp/main.go
index eb977d5..50a2ecd 100644
--- a/cmd/idp/main.go
+++ b/cmd/idp/main.go
@@ -31,14 +31,15 @@ import (
 	"sync/atomic"
 	"time"
 
-	"code.cacert.org/cacert/oidc-idp/internal/handlers"
-	"code.cacert.org/cacert/oidc-idp/internal/services"
-	"code.cacert.org/cacert/oidc-idp/ui"
 	"github.com/go-openapi/runtime/client"
 	"github.com/gorilla/csrf"
 	"github.com/knadh/koanf"
 	hydra "github.com/ory/hydra-client-go/client"
 	log "github.com/sirupsen/logrus"
+
+	"code.cacert.org/cacert/oidc-idp/internal/handlers"
+	"code.cacert.org/cacert/oidc-idp/internal/services"
+	"code.cacert.org/cacert/oidc-idp/ui"
 )
 
 const (
diff --git a/internal/handlers/error.go b/internal/handlers/error.go
index 10091ad..df43be5 100644
--- a/internal/handlers/error.go
+++ b/internal/handlers/error.go
@@ -25,10 +25,11 @@ import (
 	"io/fs"
 	"net/http"
 
-	"code.cacert.org/cacert/oidc-idp/internal/services"
-	"code.cacert.org/cacert/oidc-idp/ui"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	log "github.com/sirupsen/logrus"
+
+	"code.cacert.org/cacert/oidc-idp/internal/services"
+	"code.cacert.org/cacert/oidc-idp/ui"
 )
 
 type errorKey int
@@ -193,8 +194,10 @@ func (h *ErrorHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	msgMarkdown := h.messageCatalog.LookupMarkdownMessage
 
 	err := h.template.Lookup("base").Execute(rendered, map[string]interface{}{
-		"Title":        msg("AuthServerErrorTitle", nil, localizer),
-		"Explanation":  template.HTML(msgMarkdown("AuthServerErrorExplanation", nil, localizer)),
+		"Title": msg("AuthServerErrorTitle", nil, localizer),
+		"Explanation": template.HTML( //nolint:gosec
+			msgMarkdown("AuthServerErrorExplanation", nil, localizer),
+		),
 		"ErrorMessage": errorDescription,
 	})
 	if err != nil {
diff --git a/internal/handlers/login.go b/internal/handlers/login.go
index f55f42b..4542a6b 100644
--- a/internal/handlers/login.go
+++ b/internal/handlers/login.go
@@ -27,13 +27,14 @@ import (
 	"strconv"
 	"time"
 
-	"code.cacert.org/cacert/oidc-idp/internal/services"
-	"code.cacert.org/cacert/oidc-idp/ui"
 	"github.com/gorilla/csrf"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"github.com/ory/hydra-client-go/client/admin"
 	hydra "github.com/ory/hydra-client-go/models"
 	log "github.com/sirupsen/logrus"
+
+	"code.cacert.org/cacert/oidc-idp/internal/services"
+	"code.cacert.org/cacert/oidc-idp/ui"
 )
 
 type acrType string
diff --git a/internal/handlers/logout.go b/internal/handlers/logout.go
index 0161351..711740f 100644
--- a/internal/handlers/logout.go
+++ b/internal/handlers/logout.go
@@ -23,11 +23,12 @@ import (
 	"net/http"
 	"time"
 
-	"code.cacert.org/cacert/oidc-idp/internal/services"
-	"code.cacert.org/cacert/oidc-idp/ui"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"github.com/ory/hydra-client-go/client/admin"
 	log "github.com/sirupsen/logrus"
+
+	"code.cacert.org/cacert/oidc-idp/internal/services"
+	"code.cacert.org/cacert/oidc-idp/ui"
 )
 
 type LogoutHandler struct {
diff --git a/internal/services/i18n.go b/internal/services/i18n.go
index 75cb6e6..f6427d2 100644
--- a/internal/services/i18n.go
+++ b/internal/services/i18n.go
@@ -22,10 +22,11 @@ import (
 	"errors"
 	"fmt"
 
-	"code.cacert.org/cacert/oidc-idp/translations"
 	log "github.com/sirupsen/logrus"
 	"github.com/yuin/goldmark"
 
+	"code.cacert.org/cacert/oidc-idp/translations"
+
 	"github.com/BurntSushi/toml"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"golang.org/x/text/language"