diff --git a/cmd/osctl/cmd/gen.go b/cmd/osctl/cmd/gen.go
index 13946054a..7bfb54111 100644
--- a/cmd/osctl/cmd/gen.go
+++ b/cmd/osctl/cmd/gen.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/talos-systems/talos/cmd/osctl/pkg/helpers"
-	"github.com/talos-systems/talos/internal/pkg/crypto/x509"
+	"github.com/talos-systems/talos/pkg/crypto/x509"
 )
 
 // genCmd represents the gen command
diff --git a/cmd/osctl/cmd/inject.go b/cmd/osctl/cmd/inject.go
index 4cce4a91b..d72ab75c4 100644
--- a/cmd/osctl/cmd/inject.go
+++ b/cmd/osctl/cmd/inject.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/talos-systems/talos/cmd/osctl/pkg/helpers"
-	"github.com/talos-systems/talos/internal/pkg/crypto/x509"
+	"github.com/talos-systems/talos/pkg/crypto/x509"
 	"github.com/talos-systems/talos/pkg/userdata"
 	yaml "gopkg.in/yaml.v2"
 )
diff --git a/internal/app/init/internal/rootfs/rootfs.go b/internal/app/init/internal/rootfs/rootfs.go
index 2768dd8be..a78ede525 100644
--- a/internal/app/init/internal/rootfs/rootfs.go
+++ b/internal/app/init/internal/rootfs/rootfs.go
@@ -16,8 +16,8 @@ import (
 	"github.com/talos-systems/talos/internal/app/init/internal/rootfs/etc"
 	"github.com/talos-systems/talos/internal/app/init/internal/rootfs/proc"
 	"github.com/talos-systems/talos/internal/pkg/constants"
-	"github.com/talos-systems/talos/internal/pkg/crypto/x509"
 	"github.com/talos-systems/talos/internal/pkg/grpc/gen"
+	"github.com/talos-systems/talos/pkg/crypto/x509"
 	"github.com/talos-systems/talos/pkg/userdata"
 	yaml "gopkg.in/yaml.v2"
 )
diff --git a/internal/app/init/pkg/system/services/kubeadm.go b/internal/app/init/pkg/system/services/kubeadm.go
index dc5b15ab3..330531bd3 100644
--- a/internal/app/init/pkg/system/services/kubeadm.go
+++ b/internal/app/init/pkg/system/services/kubeadm.go
@@ -27,8 +27,8 @@ import (
 	"github.com/talos-systems/talos/internal/app/init/pkg/system/runner/containerd"
 	"github.com/talos-systems/talos/internal/app/trustd/proto"
 	"github.com/talos-systems/talos/internal/pkg/constants"
-	"github.com/talos-systems/talos/internal/pkg/crypto/x509"
 	"github.com/talos-systems/talos/internal/pkg/grpc/middleware/auth/basic"
+	"github.com/talos-systems/talos/pkg/crypto/x509"
 	"github.com/talos-systems/talos/pkg/userdata"
 
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
diff --git a/internal/app/trustd/internal/reg/reg.go b/internal/app/trustd/internal/reg/reg.go
index f0c833dc6..0b431005e 100644
--- a/internal/app/trustd/internal/reg/reg.go
+++ b/internal/app/trustd/internal/reg/reg.go
@@ -12,7 +12,7 @@ import (
 	"path"
 
 	"github.com/talos-systems/talos/internal/app/trustd/proto"
-	"github.com/talos-systems/talos/internal/pkg/crypto/x509"
+	"github.com/talos-systems/talos/pkg/crypto/x509"
 	"github.com/talos-systems/talos/pkg/userdata"
 	"google.golang.org/grpc"
 )
diff --git a/internal/pkg/grpc/gen/gen.go b/internal/pkg/grpc/gen/gen.go
index 6dfd4d323..dededdf0c 100644
--- a/internal/pkg/grpc/gen/gen.go
+++ b/internal/pkg/grpc/gen/gen.go
@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/talos-systems/talos/internal/app/trustd/proto"
-	"github.com/talos-systems/talos/internal/pkg/crypto/x509"
 	"github.com/talos-systems/talos/internal/pkg/grpc/middleware/auth/basic"
+	"github.com/talos-systems/talos/pkg/crypto/x509"
 	"github.com/talos-systems/talos/pkg/userdata"
 	"google.golang.org/grpc"
 )
diff --git a/internal/pkg/crypto/x509/x509.go b/pkg/crypto/x509/x509.go
similarity index 100%
rename from internal/pkg/crypto/x509/x509.go
rename to pkg/crypto/x509/x509.go
diff --git a/pkg/userdata/userdata.go b/pkg/userdata/userdata.go
index 26c2b2ae2..a4d947588 100644
--- a/pkg/userdata/userdata.go
+++ b/pkg/userdata/userdata.go
@@ -18,8 +18,8 @@ import (
 	"path"
 	"time"
 
-	"github.com/talos-systems/talos/internal/pkg/crypto/x509"
 	"github.com/talos-systems/talos/internal/pkg/net"
+	"github.com/talos-systems/talos/pkg/crypto/x509"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"