diff --git a/core/cmd/mkenrolment/main.go b/core/cmd/mkenrolment/main.go
index a3254e0..8b29489 100644
--- a/core/cmd/mkenrolment/main.go
+++ b/core/cmd/mkenrolment/main.go
@@ -21,9 +21,10 @@
 	"io/ioutil"
 	"os"
 
-	"git.monogon.dev/source/nexantic.git/core/generated/api"
 	"github.com/gogo/protobuf/proto"
 	"google.golang.org/grpc"
+
+	"git.monogon.dev/source/nexantic.git/core/generated/api"
 )
 
 func main() {
diff --git a/core/cmd/mkimage/main.go b/core/cmd/mkimage/main.go
index 0803c80..ddf8813 100644
--- a/core/cmd/mkimage/main.go
+++ b/core/cmd/mkimage/main.go
@@ -22,7 +22,7 @@
 	"io/ioutil"
 	"os"
 
-	"github.com/diskfs/go-diskfs"
+	diskfs "github.com/diskfs/go-diskfs"
 	"github.com/diskfs/go-diskfs/disk"
 	"github.com/diskfs/go-diskfs/filesystem"
 	"github.com/diskfs/go-diskfs/partition/gpt"
diff --git a/core/internal/api/cluster.go b/core/internal/api/cluster.go
index dc794b3..fb2c982 100644
--- a/core/internal/api/cluster.go
+++ b/core/internal/api/cluster.go
@@ -22,13 +22,14 @@
 	"encoding/base64"
 	"io"
 
-	"git.monogon.dev/source/nexantic.git/core/generated/api"
-	schema "git.monogon.dev/source/nexantic.git/core/generated/api"
 	"github.com/gogo/protobuf/proto"
 	"go.etcd.io/etcd/clientv3"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
+	"git.monogon.dev/source/nexantic.git/core/generated/api"
+	schema "git.monogon.dev/source/nexantic.git/core/generated/api"
+
 	"go.uber.org/zap"
 )
 
diff --git a/core/internal/api/enrolment.go b/core/internal/api/enrolment.go
index 976b0f2..6bf65f4 100644
--- a/core/internal/api/enrolment.go
+++ b/core/internal/api/enrolment.go
@@ -22,9 +22,10 @@
 	"errors"
 	"fmt"
 
-	"git.monogon.dev/source/nexantic.git/core/generated/api"
 	"github.com/gogo/protobuf/proto"
 	"go.etcd.io/etcd/clientv3"
+
+	"git.monogon.dev/source/nexantic.git/core/generated/api"
 )
 
 const enrolmentPrefix = "enrolments/"
diff --git a/core/internal/api/nodemanagement.go b/core/internal/api/nodemanagement.go
index 4268a0f..2becd00 100644
--- a/core/internal/api/nodemanagement.go
+++ b/core/internal/api/nodemanagement.go
@@ -29,13 +29,14 @@
 	"fmt"
 	"io"
 
-	"git.monogon.dev/source/nexantic.git/core/generated/api"
-	"git.monogon.dev/source/nexantic.git/core/pkg/tpm"
 	"github.com/gogo/protobuf/proto"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+
+	"git.monogon.dev/source/nexantic.git/core/generated/api"
+	"git.monogon.dev/source/nexantic.git/core/pkg/tpm"
 )
 
 const nodesPrefix = "nodes/"
diff --git a/core/internal/api/server.go b/core/internal/api/server.go
index 4e1e5fa..88f33f9 100644
--- a/core/internal/api/server.go
+++ b/core/internal/api/server.go
@@ -29,16 +29,17 @@
 	"net"
 	"time"
 
+	"go.etcd.io/etcd/clientv3"
+	"go.uber.org/zap"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/reflection"
+
 	"git.monogon.dev/source/nexantic.git/core/generated/api"
 	schema "git.monogon.dev/source/nexantic.git/core/generated/api"
 	"git.monogon.dev/source/nexantic.git/core/internal/common"
 	"git.monogon.dev/source/nexantic.git/core/internal/common/service"
 	"git.monogon.dev/source/nexantic.git/core/internal/consensus"
-	"go.etcd.io/etcd/clientv3"
-	"go.uber.org/zap"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/reflection"
-	"google.golang.org/grpc/credentials"
 )
 
 type (
diff --git a/core/internal/consensus/consensus.go b/core/internal/consensus/consensus.go
index 5a0bead..77a8a11 100644
--- a/core/internal/consensus/consensus.go
+++ b/core/internal/consensus/consensus.go
@@ -38,7 +38,6 @@
 
 	"git.monogon.dev/source/nexantic.git/core/generated/api"
 
-	"git.monogon.dev/source/nexantic.git/core/internal/consensus/ca"
 	"github.com/pkg/errors"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/clientv3/namespace"
@@ -48,6 +47,8 @@
 	"go.etcd.io/etcd/proxy/grpcproxy/adapter"
 	"go.uber.org/zap"
 	"golang.org/x/sys/unix"
+
+	"git.monogon.dev/source/nexantic.git/core/internal/consensus/ca"
 )
 
 const (
diff --git a/core/internal/integrity/common.go b/core/internal/integrity/common.go
index f92c008..6850a12 100644
--- a/core/internal/integrity/common.go
+++ b/core/internal/integrity/common.go
@@ -25,10 +25,11 @@
 	"net"
 	"strings"
 
-	"git.monogon.dev/source/nexantic.git/core/generated/api"
-	"git.monogon.dev/source/nexantic.git/core/internal/common"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+
+	"git.monogon.dev/source/nexantic.git/core/generated/api"
+	"git.monogon.dev/source/nexantic.git/core/internal/common"
 )
 
 // Agent specifices the interface which every integrity agent needs to fulfill
diff --git a/core/internal/kubernetes/apiserver.go b/core/internal/kubernetes/apiserver.go
index c2664a6..858fdb1 100644
--- a/core/internal/kubernetes/apiserver.go
+++ b/core/internal/kubernetes/apiserver.go
@@ -26,8 +26,9 @@
 	"os/exec"
 	"path"
 
-	"git.monogon.dev/source/nexantic.git/core/pkg/fileargs"
 	"go.etcd.io/etcd/clientv3"
+
+	"git.monogon.dev/source/nexantic.git/core/pkg/fileargs"
 )
 
 type apiserverConfig struct {
diff --git a/core/internal/kubernetes/controller-manager.go b/core/internal/kubernetes/controller-manager.go
index fab0036..1146a14 100644
--- a/core/internal/kubernetes/controller-manager.go
+++ b/core/internal/kubernetes/controller-manager.go
@@ -23,8 +23,9 @@
 	"os"
 	"os/exec"
 
-	"git.monogon.dev/source/nexantic.git/core/pkg/fileargs"
 	"go.etcd.io/etcd/clientv3"
+
+	"git.monogon.dev/source/nexantic.git/core/pkg/fileargs"
 )
 
 type controllerManagerConfig struct {
diff --git a/core/internal/kubernetes/scheduler.go b/core/internal/kubernetes/scheduler.go
index baaebc5..ac21588 100644
--- a/core/internal/kubernetes/scheduler.go
+++ b/core/internal/kubernetes/scheduler.go
@@ -22,8 +22,9 @@
 	"os"
 	"os/exec"
 
-	"git.monogon.dev/source/nexantic.git/core/pkg/fileargs"
 	"go.etcd.io/etcd/clientv3"
+
+	"git.monogon.dev/source/nexantic.git/core/pkg/fileargs"
 )
 
 type schedulerConfig struct {
diff --git a/core/internal/kubernetes/service.go b/core/internal/kubernetes/service.go
index 57f2822..9d653b4 100644
--- a/core/internal/kubernetes/service.go
+++ b/core/internal/kubernetes/service.go
@@ -20,10 +20,11 @@
 	"errors"
 	"net"
 
-	"git.monogon.dev/source/nexantic.git/core/internal/common/service"
-	"git.monogon.dev/source/nexantic.git/core/internal/consensus"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
+
+	"git.monogon.dev/source/nexantic.git/core/internal/common/service"
+	"git.monogon.dev/source/nexantic.git/core/internal/consensus"
 )
 
 type Config struct {
diff --git a/core/internal/storage/blockdev.go b/core/internal/storage/blockdev.go
index 8bdad12..da3dcfa 100644
--- a/core/internal/storage/blockdev.go
+++ b/core/internal/storage/blockdev.go
@@ -20,10 +20,11 @@
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
-	"git.monogon.dev/source/nexantic.git/core/pkg/devicemapper"
 	"os"
 	"syscall"
 
+	"git.monogon.dev/source/nexantic.git/core/pkg/devicemapper"
+
 	"golang.org/x/sys/unix"
 )
 
diff --git a/core/internal/storage/data.go b/core/internal/storage/data.go
index 2b2251a..99a49eb 100644
--- a/core/internal/storage/data.go
+++ b/core/internal/storage/data.go
@@ -24,9 +24,10 @@
 	"path/filepath"
 	"sync"
 
-	"git.monogon.dev/source/nexantic.git/core/pkg/tpm"
 	"go.uber.org/zap"
 	"golang.org/x/sys/unix"
+
+	"git.monogon.dev/source/nexantic.git/core/pkg/tpm"
 )
 
 const (
diff --git a/core/internal/storage/find.go b/core/internal/storage/find.go
index 0ba1ca0..1abf6c0 100644
--- a/core/internal/storage/find.go
+++ b/core/internal/storage/find.go
@@ -18,12 +18,13 @@
 
 import (
 	"fmt"
-	"git.monogon.dev/source/nexantic.git/core/pkg/sysfs"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
 
+	"git.monogon.dev/source/nexantic.git/core/pkg/sysfs"
+
 	"github.com/rekby/gpt"
 	"golang.org/x/sys/unix"
 )