diff --git a/cmd/hepto.go b/cmd/hepto.go
index 1044f73d6666ddcd843d264a1cd149a5867076cd..82be07c0c61961049df6c01472bb1561b2e78498 100644
--- a/cmd/hepto.go
+++ b/cmd/hepto.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"forge.tedomum.net/acides/hepto/hepto/cmd/hepto"
+	"forge.tedomum.net/acides/hepto/cmd/hepto"
 	containerd "github.com/containerd/containerd/cmd/containerd/command"
 	ctr "github.com/containerd/containerd/cmd/ctr/app"
 	"github.com/containerd/containerd/plugin"
diff --git a/cmd/hepto/config.go b/cmd/hepto/config.go
index d2f1e65e7a7d4855f5a511c5962d7723b39b7427..1948f2c53df3b46eb562e1b10543123c454a7815 100644
--- a/cmd/hepto/config.go
+++ b/cmd/hepto/config.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"path"
 
-	"forge.tedomum.net/acides/hepto/hepto/pkg/cluster"
-	"forge.tedomum.net/acides/hepto/hepto/pkg/selfcontain"
+	"forge.tedomum.net/acides/hepto/pkg/cluster"
+	"forge.tedomum.net/acides/hepto/pkg/selfcontain"
 	"github.com/go-logr/logr"
 	"github.com/go-logr/zapr"
 	"github.com/spf13/cobra"
diff --git a/cmd/hepto/root.go b/cmd/hepto/root.go
index 83827368bd5438554ca166629c2b161408f37055..c29c483cd5849c2300d36ac0b182a8060c041d7d 100644
--- a/cmd/hepto/root.go
+++ b/cmd/hepto/root.go
@@ -7,8 +7,8 @@ import (
 	"os/exec"
 	"time"
 
-	"forge.tedomum.net/acides/hepto/hepto/pkg/cluster"
-	"forge.tedomum.net/acides/hepto/hepto/pkg/selfcontain"
+	"forge.tedomum.net/acides/hepto/pkg/cluster"
+	"forge.tedomum.net/acides/hepto/pkg/selfcontain"
 	"github.com/spf13/cobra"
 )
 
diff --git a/go.mod b/go.mod
index 523f7e682068cea8fbcbfac49beab77eda3e8164..1d301288e41970a18d918833b3b879fff12f1c46 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module forge.tedomum.net/acides/hepto/hepto
+module forge.tedomum.net/acides/hepto
 
 go 1.19
 
diff --git a/pkg/cluster/certs.go b/pkg/cluster/certs.go
index 3dd171fcb44d80bf1831cc5ccb072ff34c27844a..48f6cc735688d3bf8dd71ee1f0e43cdd82895f9d 100644
--- a/pkg/cluster/certs.go
+++ b/pkg/cluster/certs.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"path"
 
-	"forge.tedomum.net/acides/hepto/hepto/pkg/pki"
+	"forge.tedomum.net/acides/hepto/pkg/pki"
 )
 
 const certsPath = "/certs"
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index e6193f3ef901a859ff49046821b06f20e5fd7630..f294945bb1c53adc741ce856546bf7dbcba76942 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -9,9 +9,9 @@ import (
 
 	"k8s.io/component-helpers/node/util/sysctl"
 
-	"forge.tedomum.net/acides/hepto/hepto/pkg/pki"
-	"forge.tedomum.net/acides/hepto/hepto/pkg/sml"
-	"forge.tedomum.net/acides/hepto/hepto/pkg/wg"
+	"forge.tedomum.net/acides/hepto/pkg/pki"
+	"forge.tedomum.net/acides/hepto/pkg/sml"
+	"forge.tedomum.net/acides/hepto/pkg/wg"
 )
 
 type Cluster struct {
diff --git a/pkg/cluster/meta.go b/pkg/cluster/meta.go
index e7cb34b44f522d6a5c8cfcd2995c920fadcca0a0..93e85d13bc6373eb14a365c83af12d4f3d32dfc7 100644
--- a/pkg/cluster/meta.go
+++ b/pkg/cluster/meta.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net"
 
-	"forge.tedomum.net/acides/hepto/hepto/pkg/pki"
+	"forge.tedomum.net/acides/hepto/pkg/pki"
 )
 
 // Represents a node metadata
diff --git a/pkg/cluster/services.go b/pkg/cluster/services.go
index 3d31511e44989bac884f96d5774d49c606377674..02ed70ed8c523cffa9a961360c42dd85690446a5 100644
--- a/pkg/cluster/services.go
+++ b/pkg/cluster/services.go
@@ -8,7 +8,7 @@ import (
 	"path"
 	"time"
 
-	"forge.tedomum.net/acides/hepto/hepto/pkg/wrappers"
+	"forge.tedomum.net/acides/hepto/pkg/wrappers"
 	"go.etcd.io/etcd/server/v3/embed"
 )
 
diff --git a/pkg/cluster/vpn.go b/pkg/cluster/vpn.go
index 88bf9cd1b71556e8f424511c9fc3e6bf32f6f352..ee3e67eda5ab7a8311ea3a5a1b1076d66f547bbd 100644
--- a/pkg/cluster/vpn.go
+++ b/pkg/cluster/vpn.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"strconv"
 
-	"forge.tedomum.net/acides/hepto/hepto/pkg/wg"
+	"forge.tedomum.net/acides/hepto/pkg/wg"
 )
 
 func (c *Cluster) initVPN() {
diff --git a/pkg/pki/ca.go b/pkg/pki/ca.go
index 93598071a69047807bb11a7dd51c8a6cdeed2428..e15d5132d2c1eb9db17e54de94fb63a77ebbb94f 100644
--- a/pkg/pki/ca.go
+++ b/pkg/pki/ca.go
@@ -1,7 +1,7 @@
 package pki
 
 import (
-	"forge.tedomum.net/acides/hepto/hepto/pkg/pekahi"
+	"forge.tedomum.net/acides/hepto/pkg/pekahi"
 )
 
 // Cluster PKI is made of three different CAs
diff --git a/pkg/pki/master.go b/pkg/pki/master.go
index ca131058dacd60341dffcb0fb0eb143010a9fc96..54089985edfd8ce4455ffc2297f4d33240937795 100644
--- a/pkg/pki/master.go
+++ b/pkg/pki/master.go
@@ -3,7 +3,7 @@ package pki
 import (
 	"net"
 
-	"forge.tedomum.net/acides/hepto/hepto/pkg/pekahi"
+	"forge.tedomum.net/acides/hepto/pkg/pekahi"
 )
 
 // Master certs
diff --git a/pkg/pki/node.go b/pkg/pki/node.go
index dfc42b1ee1700012af8c9559cf3479415558c556..0d6c8f22e5aff05353935b283fb7b93ef44137eb 100644
--- a/pkg/pki/node.go
+++ b/pkg/pki/node.go
@@ -3,7 +3,7 @@ package pki
 import (
 	"net"
 
-	"forge.tedomum.net/acides/hepto/hepto/pkg/pekahi"
+	"forge.tedomum.net/acides/hepto/pkg/pekahi"
 )
 
 // Node certs
diff --git a/pkg/pki/utils.go b/pkg/pki/utils.go
index ca52dfbaff4318a1da9a69ecc1633e9c0f923dab..cac8b642472db695f77c3174820ed863e0e9f95a 100644
--- a/pkg/pki/utils.go
+++ b/pkg/pki/utils.go
@@ -3,7 +3,7 @@ package pki
 import (
 	"crypto/x509"
 
-	"forge.tedomum.net/acides/hepto/hepto/pkg/pekahi"
+	"forge.tedomum.net/acides/hepto/pkg/pekahi"
 )
 
 // Merge a single node or master certificate