From 7ea5c41f9ba97b5cbcb36dd07b5d085570f0dcc9 Mon Sep 17 00:00:00 2001
From: miampf <miampf@proton.me>
Date: Tue, 1 Jul 2025 12:47:04 +0200
Subject: [PATCH] feat: use SSH host certificates (#3786)

---
 .github/actions/e2e_emergency_ssh/action.yml  |  10 +-
 .github/actions/e2e_test/action.yml           |   6 +-
 bootstrapper/internal/addresses/BUILD.bazel   |  26 +++
 bootstrapper/internal/addresses/addresses.go  |  45 +++++
 .../internal/addresses/addresses_test.go      |  67 ++++++++
 bootstrapper/internal/initserver/BUILD.bazel  |   3 +
 .../internal/initserver/initserver.go         |  99 ++++++-----
 .../internal/initserver/initserver_test.go    |  61 +++++--
 bootstrapper/internal/joinclient/BUILD.bazel  |   4 +
 .../internal/joinclient/joinclient.go         |  51 +++++-
 .../internal/joinclient/joinclient_test.go    | 160 +++++++++++++++---
 cli/internal/cmd/ssh.go                       |   7 +-
 docs/docs/workflows/troubleshooting.md        |  10 +-
 .../system-preset/30-constellation.preset     |   1 -
 .../system/constellation-bootstrapper.service |   3 +-
 .../system/create-host-ssh-key.service        |  10 --
 image/sysroot-tree/etc/ssh/sshd_config        |   5 +-
 .../sshd-keygen@.service.d/override.conf      |   3 +
 .../usr/lib/systemd/system/sshd-keygen.target |   3 +
 .../usr/libexec/openssh/sshd-keygen           |  44 +++++
 internal/constants/constants.go               |   8 +-
 .../join-service/templates/daemonset.yaml     |   5 +
 .../join-service/templates/daemonset.yaml     |   5 +
 .../join-service/templates/daemonset.yaml     |   5 +
 .../join-service/templates/daemonset.yaml     |   5 +
 .../join-service/templates/daemonset.yaml     |   5 +
 .../join-service/templates/daemonset.yaml     |   5 +
 internal/crypto/crypto.go                     |  23 +++
 joinservice/cmd/main.go                       |   1 +
 joinservice/internal/server/BUILD.bazel       |   4 +
 joinservice/internal/server/server.go         |  25 +++
 joinservice/internal/server/server_test.go    |  63 ++++++-
 joinservice/joinproto/join.pb.go              |  45 ++++-
 joinservice/joinproto/join.proto              |   6 +
 34 files changed, 706 insertions(+), 117 deletions(-)
 create mode 100644 bootstrapper/internal/addresses/BUILD.bazel
 create mode 100644 bootstrapper/internal/addresses/addresses.go
 create mode 100644 bootstrapper/internal/addresses/addresses_test.go
 delete mode 100644 image/base/mkosi.skeleton/usr/lib/systemd/system/create-host-ssh-key.service
 create mode 100644 image/sysroot-tree/etc/systemd/system/sshd-keygen@.service.d/override.conf
 create mode 100644 image/sysroot-tree/usr/lib/systemd/system/sshd-keygen.target
 create mode 100644 image/sysroot-tree/usr/libexec/openssh/sshd-keygen

diff --git a/.github/actions/e2e_emergency_ssh/action.yml b/.github/actions/e2e_emergency_ssh/action.yml
index 81712956a..27b3e8b13 100644
--- a/.github/actions/e2e_emergency_ssh/action.yml
+++ b/.github/actions/e2e_emergency_ssh/action.yml
@@ -23,19 +23,21 @@ runs:
         lb="$(terraform output -raw loadbalancer_address)"
         popd
 
+        lb_ip="$(gethostip $lb | awk '{print $2}')"
+        echo "Resolved ip of load balancer: $lb_ip"
+
         # write ssh config
         cat > ssh_config <<EOF
-        Host $lb
+        Host $lb_ip
           ProxyJump none
 
         Host *
-          StrictHostKeyChecking no
-          UserKnownHostsFile=/dev/null
           IdentityFile ./access-key
           PreferredAuthentications publickey
           CertificateFile=constellation_cert.pub
+          UserKnownHostsFile=./known_hosts
           User root
-          ProxyJump $lb
+          ProxyJump $lb_ip
         EOF
 
         for i in {1..26}; do
diff --git a/.github/actions/e2e_test/action.yml b/.github/actions/e2e_test/action.yml
index 3f1efe4c1..c2a66db80 100644
--- a/.github/actions/e2e_test/action.yml
+++ b/.github/actions/e2e_test/action.yml
@@ -150,7 +150,9 @@ runs:
     - name: Setup bazel
       uses: ./.github/actions/setup_bazel_nix
       with:
-        nixTools: terraform
+        nixTools: |
+          terraform
+          syslinux
 
     - name: Log in to the Container registry
       uses: ./.github/actions/container_registry_login
@@ -452,7 +454,7 @@ runs:
         s3AccessKey: ${{ inputs.s3AccessKey }}
         s3SecretKey: ${{ inputs.s3SecretKey }}
         githubToken: ${{ inputs.githubToken }}
-    
+
     - name: Run emergency ssh test
       if: inputs.test == 'emergency ssh'
       uses: ./.github/actions/e2e_emergency_ssh
diff --git a/bootstrapper/internal/addresses/BUILD.bazel b/bootstrapper/internal/addresses/BUILD.bazel
new file mode 100644
index 000000000..9311c4a61
--- /dev/null
+++ b/bootstrapper/internal/addresses/BUILD.bazel
@@ -0,0 +1,26 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("//bazel/go:go_test.bzl", "go_test")
+
+go_library(
+    name = "interfaces",
+    srcs = ["interfaces.go"],
+    importpath = "github.com/edgelesssys/constellation/v2/bootstrapper/internal/interfaces",
+    visibility = ["//bootstrapper:__subpackages__"],
+)
+
+go_library(
+    name = "addresses",
+    srcs = ["addresses.go"],
+    importpath = "github.com/edgelesssys/constellation/v2/bootstrapper/internal/addresses",
+    visibility = ["//bootstrapper:__subpackages__"],
+)
+
+go_test(
+    name = "addresses_test",
+    srcs = ["addresses_test.go"],
+    deps = [
+        ":addresses",
+        "@com_github_stretchr_testify//assert",
+        "@com_github_stretchr_testify//require",
+    ],
+)
diff --git a/bootstrapper/internal/addresses/addresses.go b/bootstrapper/internal/addresses/addresses.go
new file mode 100644
index 000000000..21fd18db5
--- /dev/null
+++ b/bootstrapper/internal/addresses/addresses.go
@@ -0,0 +1,45 @@
+/*
+Copyright (c) Edgeless Systems GmbH
+
+SPDX-License-Identifier: AGPL-3.0-only
+*/
+
+package addresses
+
+import (
+	"net"
+)
+
+// GetMachineNetworkAddresses retrieves all network interface addresses.
+func GetMachineNetworkAddresses(interfaces []NetInterface) ([]string, error) {
+	var addresses []string
+
+	for _, i := range interfaces {
+		addrs, err := i.Addrs()
+		if err != nil {
+			return nil, err
+		}
+		for _, addr := range addrs {
+			var ip net.IP
+			switch v := addr.(type) {
+			case *net.IPNet:
+				ip = v.IP
+			case *net.IPAddr:
+				ip = v.IP
+			default:
+				continue
+			}
+			if ip.IsLoopback() {
+				continue
+			}
+			addresses = append(addresses, ip.String())
+		}
+	}
+
+	return addresses, nil
+}
+
+// NetInterface represents a network interface used to get network addresses.
+type NetInterface interface {
+	Addrs() ([]net.Addr, error)
+}
diff --git a/bootstrapper/internal/addresses/addresses_test.go b/bootstrapper/internal/addresses/addresses_test.go
new file mode 100644
index 000000000..408750aa8
--- /dev/null
+++ b/bootstrapper/internal/addresses/addresses_test.go
@@ -0,0 +1,67 @@
+/*
+Copyright (c) Edgeless Systems GmbH
+
+SPDX-License-Identifier: AGPL-3.0-only
+*/
+
+package addresses_test
+
+import (
+	"errors"
+	"net"
+	"testing"
+
+	"github.com/edgelesssys/constellation/v2/bootstrapper/internal/addresses"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGetMachineNetworkAddresses(t *testing.T) {
+	_, someAddr, err := net.ParseCIDR("10.9.0.1/24")
+	require.NoError(t, err)
+
+	testCases := map[string]struct {
+		interfaces []addresses.NetInterface
+		wantErr    bool
+	}{
+		"successful": {
+			interfaces: []addresses.NetInterface{
+				&mockNetInterface{
+					addrs: []net.Addr{
+						someAddr,
+					},
+				},
+			},
+		},
+		"unsuccessful": {
+			interfaces: []addresses.NetInterface{
+				&mockNetInterface{addrs: nil, err: errors.New("someError")},
+			},
+			wantErr: true,
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			assert := assert.New(t)
+
+			addrs, err := addresses.GetMachineNetworkAddresses(tc.interfaces)
+
+			if tc.wantErr {
+				assert.Error(err)
+			} else {
+				assert.Equal([]string{"10.9.0.0"}, addrs)
+				assert.NoError(err)
+			}
+		})
+	}
+}
+
+type mockNetInterface struct {
+	addrs []net.Addr
+	err   error
+}
+
+func (m *mockNetInterface) Addrs() ([]net.Addr, error) {
+	return m.addrs, m.err
+}
diff --git a/bootstrapper/internal/initserver/BUILD.bazel b/bootstrapper/internal/initserver/BUILD.bazel
index f45aad1e6..c25ec5c4a 100644
--- a/bootstrapper/internal/initserver/BUILD.bazel
+++ b/bootstrapper/internal/initserver/BUILD.bazel
@@ -8,6 +8,7 @@ go_library(
     visibility = ["//bootstrapper:__subpackages__"],
     deps = [
         "//bootstrapper/initproto",
+        "//bootstrapper/internal/addresses",
         "//bootstrapper/internal/journald",
         "//internal/atls",
         "//internal/attestation",
@@ -43,6 +44,7 @@ go_test(
         "//bootstrapper/initproto",
         "//internal/atls",
         "//internal/attestation/variant",
+        "//internal/constants",
         "//internal/crypto/testvector",
         "//internal/file",
         "//internal/kms/setup",
@@ -54,6 +56,7 @@ go_test(
         "@com_github_stretchr_testify//require",
         "@org_golang_google_grpc//:grpc",
         "@org_golang_x_crypto//bcrypt",
+        "@org_golang_x_crypto//ssh",
         "@org_uber_go_goleak//:goleak",
     ],
 )
diff --git a/bootstrapper/internal/initserver/initserver.go b/bootstrapper/internal/initserver/initserver.go
index fad54abda..b7d23885d 100644
--- a/bootstrapper/internal/initserver/initserver.go
+++ b/bootstrapper/internal/initserver/initserver.go
@@ -26,11 +26,13 @@ import (
 	"io"
 	"log/slog"
 	"net"
+	"os"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/edgelesssys/constellation/v2/bootstrapper/initproto"
+	"github.com/edgelesssys/constellation/v2/bootstrapper/internal/addresses"
 	"github.com/edgelesssys/constellation/v2/bootstrapper/internal/journald"
 	"github.com/edgelesssys/constellation/v2/internal/atls"
 	"github.com/edgelesssys/constellation/v2/internal/attestation"
@@ -153,35 +155,23 @@ func (s *Server) Init(req *initproto.InitRequest, stream initproto.API_InitServe
 	s.kmsURI = req.KmsUri
 
 	if err := bcrypt.CompareHashAndPassword(s.initSecretHash, req.InitSecret); err != nil {
-		if e := s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "invalid init secret %s", err)); e != nil {
-			err = errors.Join(err, e)
-		}
-		return err
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "invalid init secret %s", err)))
 	}
 
 	cloudKms, err := kmssetup.KMS(stream.Context(), req.StorageUri, req.KmsUri)
 	if err != nil {
-		if e := s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "creating kms client: %s", err)); e != nil {
-			err = errors.Join(err, e)
-		}
-		return err
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "creating kms client: %s", err)))
 	}
 
 	// generate values for cluster attestation
 	clusterID, err := deriveMeasurementValues(stream.Context(), req.MeasurementSalt, cloudKms)
 	if err != nil {
-		if e := s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "deriving measurement values: %s", err)); e != nil {
-			err = errors.Join(err, e)
-		}
-		return err
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "deriving measurement values: %s", err)))
 	}
 
 	nodeLockAcquired, err := s.nodeLock.TryLockOnce(clusterID)
 	if err != nil {
-		if e := s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "locking node: %s", err)); e != nil {
-			err = errors.Join(err, e)
-		}
-		return err
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "locking node: %s", err)))
 	}
 	if !nodeLockAcquired {
 		// The join client seems to already have a connection to an
@@ -208,10 +198,7 @@ func (s *Server) Init(req *initproto.InitRequest, stream initproto.API_InitServe
 	}()
 
 	if err := s.setupDisk(stream.Context(), cloudKms); err != nil {
-		if e := s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "setting up disk: %s", err)); e != nil {
-			err = errors.Join(err, e)
-		}
-		return err
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "setting up disk: %s", err)))
 	}
 
 	state := nodestate.NodeState{
@@ -219,32 +206,67 @@ func (s *Server) Init(req *initproto.InitRequest, stream initproto.API_InitServe
 		MeasurementSalt: req.MeasurementSalt,
 	}
 	if err := state.ToFile(s.fileHandler); err != nil {
-		if e := s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "persisting node state: %s", err)); e != nil {
-			err = errors.Join(err, e)
-		}
-		return err
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "persisting node state: %s", err)))
 	}
 
 	// Derive the emergency ssh CA key
 	key, err := cloudKms.GetDEK(stream.Context(), crypto.DEKPrefix+constants.SSHCAKeySuffix, ed25519.SeedSize)
 	if err != nil {
-		if e := s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "retrieving DEK for key derivation: %s", err)); e != nil {
-			err = errors.Join(err, e)
-		}
-		return err
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "retrieving DEK for key derivation: %s", err)))
 	}
 	ca, err := crypto.GenerateEmergencySSHCAKey(key)
 	if err != nil {
-		if e := s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "generating emergency SSH CA key: %s", err)); e != nil {
-			err = errors.Join(err, e)
-		}
-		return err
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "generating emergency SSH CA key: %s", err)))
 	}
 	if err := s.fileHandler.Write(constants.SSHCAKeyPath, ssh.MarshalAuthorizedKey(ca.PublicKey()), file.OptMkdirAll); err != nil {
-		if e := s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "writing ssh CA pubkey: %s", err)); e != nil {
-			err = errors.Join(err, e)
-		}
-		return err
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "writing ssh CA pubkey: %s", err)))
+	}
+
+	interfaces, err := net.Interfaces()
+	if err != nil {
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "getting network interfaces: %s", err)))
+	}
+	// Needed since go doesn't implicitly convert slices of structs to slices of interfaces
+	interfacesForFunc := make([]addresses.NetInterface, len(interfaces))
+	for i := range interfaces {
+		interfacesForFunc[i] = &interfaces[i]
+	}
+
+	principalList, err := addresses.GetMachineNetworkAddresses(interfacesForFunc)
+	if err != nil {
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "failed to get network addresses: %s", err)))
+	}
+	hostname, err := os.Hostname()
+	if err != nil {
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "failed to get hostname: %s", err)))
+	}
+
+	principalList = append(principalList, hostname)
+	principalList = append(principalList, req.ApiserverCertSans...)
+
+	hostKeyContent, err := s.fileHandler.Read(constants.SSHHostKeyPath)
+	if err != nil {
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "failed to read host SSH key: %s", err)))
+	}
+
+	hostPrivateKey, err := ssh.ParsePrivateKey(hostKeyContent)
+	if err != nil {
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "failed to parse host SSH key: %s", err)))
+	}
+
+	hostKeyPubSSH := hostPrivateKey.PublicKey()
+
+	hostCertificate, err := crypto.GenerateSSHHostCertificate(principalList, hostKeyPubSSH, ca)
+	if err != nil {
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "generating SSH host certificate: %s", err)))
+	}
+
+	if err := s.fileHandler.Write(constants.SSHAdditionalPrincipalsPath, []byte(strings.Join(req.ApiserverCertSans, ",")), file.OptMkdirAll); err != nil {
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "writing list of public ssh principals: %s", err)))
+	}
+
+	if err := s.fileHandler.Write(constants.SSHHostCertificatePath, ssh.MarshalAuthorizedKey(hostCertificate), file.OptMkdirAll); err != nil {
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "writing ssh host certificate: %s", err)))
 	}
 
 	clusterName := req.ClusterName
@@ -261,10 +283,7 @@ func (s *Server) Init(req *initproto.InitRequest, stream initproto.API_InitServe
 		req.ServiceCidr,
 	)
 	if err != nil {
-		if e := s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "initializing cluster: %s", err)); e != nil {
-			err = errors.Join(err, e)
-		}
-		return err
+		return errors.Join(err, s.sendLogsWithMessage(stream, status.Errorf(codes.Internal, "initializing cluster: %s", err)))
 	}
 
 	log.Info("Init succeeded")
diff --git a/bootstrapper/internal/initserver/initserver_test.go b/bootstrapper/internal/initserver/initserver_test.go
index 878a1fe80..99c53e627 100644
--- a/bootstrapper/internal/initserver/initserver_test.go
+++ b/bootstrapper/internal/initserver/initserver_test.go
@@ -9,9 +9,12 @@ package initserver
 import (
 	"bytes"
 	"context"
+	"crypto/ed25519"
+	"encoding/pem"
 	"errors"
 	"io"
 	"net"
+	"os"
 	"strings"
 	"sync"
 	"testing"
@@ -20,6 +23,7 @@ import (
 	"github.com/edgelesssys/constellation/v2/bootstrapper/initproto"
 	"github.com/edgelesssys/constellation/v2/internal/atls"
 	"github.com/edgelesssys/constellation/v2/internal/attestation/variant"
+	"github.com/edgelesssys/constellation/v2/internal/constants"
 	"github.com/edgelesssys/constellation/v2/internal/crypto/testvector"
 	"github.com/edgelesssys/constellation/v2/internal/file"
 	kmssetup "github.com/edgelesssys/constellation/v2/internal/kms/setup"
@@ -31,6 +35,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
 	"golang.org/x/crypto/bcrypt"
+	"golang.org/x/crypto/ssh"
 	"google.golang.org/grpc"
 )
 
@@ -100,17 +105,31 @@ func TestInit(t *testing.T) {
 
 	masterSecret := uri.MasterSecret{Key: []byte("secret"), Salt: []byte("salt")}
 
+	_, privkey, err := ed25519.GenerateKey(nil)
+	require.NoError(t, err)
+	pemHostKey, err := ssh.MarshalPrivateKey(privkey, "")
+	require.NoError(t, err)
+
+	fsWithHostKey := afero.NewMemMapFs()
+	hostKeyFile, err := fsWithHostKey.Create(constants.SSHHostKeyPath)
+	require.NoError(t, err)
+	_, err = hostKeyFile.Write(pem.EncodeToMemory(pemHostKey))
+	require.NoError(t, err)
+	require.NoError(t, hostKeyFile.Close())
+	readOnlyFSWithHostKey := afero.NewReadOnlyFs(fsWithHostKey)
+
 	testCases := map[string]struct {
-		nodeLock       *fakeLock
-		initializer    ClusterInitializer
-		disk           encryptedDisk
-		fileHandler    file.Handler
-		req            *initproto.InitRequest
-		stream         stubStream
-		logCollector   stubJournaldCollector
-		initSecretHash []byte
-		wantErr        bool
-		wantShutdown   bool
+		nodeLock           *fakeLock
+		initializer        ClusterInitializer
+		disk               encryptedDisk
+		fileHandler        file.Handler
+		req                *initproto.InitRequest
+		stream             stubStream
+		logCollector       stubJournaldCollector
+		initSecretHash     []byte
+		hostkeyDoesntExist bool
+		wantErr            bool
+		wantShutdown       bool
 	}{
 		"successful init": {
 			nodeLock:       newFakeLock(),
@@ -174,7 +193,7 @@ func TestInit(t *testing.T) {
 			nodeLock:       newFakeLock(),
 			initializer:    &stubClusterInitializer{},
 			disk:           &stubDisk{},
-			fileHandler:    file.NewHandler(afero.NewReadOnlyFs(afero.NewMemMapFs())),
+			fileHandler:    file.NewHandler(readOnlyFSWithHostKey),
 			req:            &initproto.InitRequest{InitSecret: initSecret, KmsUri: masterSecret.EncodeToURI(), StorageUri: uri.NoStoreURI},
 			stream:         stubStream{},
 			logCollector:   stubJournaldCollector{logPipe: &stubReadCloser{reader: bytes.NewReader([]byte{})}},
@@ -205,11 +224,31 @@ func TestInit(t *testing.T) {
 			logCollector:   stubJournaldCollector{logPipe: &stubReadCloser{reader: bytes.NewReader([]byte{})}},
 			wantErr:        true,
 		},
+		"host key doesn't exist": {
+			nodeLock:           newFakeLock(),
+			initializer:        &stubClusterInitializer{},
+			disk:               &stubDisk{},
+			fileHandler:        file.NewHandler(afero.NewMemMapFs()),
+			initSecretHash:     initSecretHash,
+			req:                &initproto.InitRequest{InitSecret: initSecret, KmsUri: masterSecret.EncodeToURI(), StorageUri: uri.NoStoreURI},
+			stream:             stubStream{},
+			logCollector:       stubJournaldCollector{logPipe: &stubReadCloser{reader: bytes.NewReader([]byte{})}},
+			hostkeyDoesntExist: true,
+			wantShutdown:       true,
+			wantErr:            true,
+		},
 	}
 
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
 			assert := assert.New(t)
+			require := require.New(t)
+
+			if _, err := tc.fileHandler.Stat(constants.SSHHostKeyPath); errors.Is(err, os.ErrNotExist) {
+				if !tc.hostkeyDoesntExist {
+					require.NoError(tc.fileHandler.Write(constants.SSHHostKeyPath, pem.EncodeToMemory(pemHostKey), file.OptMkdirAll))
+				}
+			}
 
 			serveStopper := newStubServeStopper()
 			server := &Server{
diff --git a/bootstrapper/internal/joinclient/BUILD.bazel b/bootstrapper/internal/joinclient/BUILD.bazel
index 048df72ac..a5424ec2d 100644
--- a/bootstrapper/internal/joinclient/BUILD.bazel
+++ b/bootstrapper/internal/joinclient/BUILD.bazel
@@ -7,6 +7,7 @@ go_library(
     importpath = "github.com/edgelesssys/constellation/v2/bootstrapper/internal/joinclient",
     visibility = ["//bootstrapper:__subpackages__"],
     deps = [
+        "//bootstrapper/internal/addresses",
         "//bootstrapper/internal/certificate",
         "//internal/attestation",
         "//internal/cloud/metadata",
@@ -21,6 +22,7 @@ go_library(
         "@io_k8s_kubernetes//cmd/kubeadm/app/constants",
         "@io_k8s_utils//clock",
         "@org_golang_google_grpc//:grpc",
+        "@org_golang_x_crypto//ssh",
     ],
 )
 
@@ -35,6 +37,7 @@ go_test(
     deps = [
         "//internal/cloud/metadata",
         "//internal/constants",
+        "//internal/crypto",
         "//internal/file",
         "//internal/grpc/atlscredentials",
         "//internal/grpc/dialer",
@@ -49,6 +52,7 @@ go_test(
         "@io_k8s_kubernetes//cmd/kubeadm/app/apis/kubeadm/v1beta3",
         "@io_k8s_utils//clock/testing",
         "@org_golang_google_grpc//:grpc",
+        "@org_golang_x_crypto//ssh",
         "@org_uber_go_goleak//:goleak",
     ],
 )
diff --git a/bootstrapper/internal/joinclient/joinclient.go b/bootstrapper/internal/joinclient/joinclient.go
index 536906988..be10cd60e 100644
--- a/bootstrapper/internal/joinclient/joinclient.go
+++ b/bootstrapper/internal/joinclient/joinclient.go
@@ -23,10 +23,12 @@ import (
 	"fmt"
 	"log/slog"
 	"net"
+	"os"
 	"path/filepath"
 	"strconv"
 	"time"
 
+	"github.com/edgelesssys/constellation/v2/bootstrapper/internal/addresses"
 	"github.com/edgelesssys/constellation/v2/bootstrapper/internal/certificate"
 	"github.com/edgelesssys/constellation/v2/internal/attestation"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/metadata"
@@ -37,6 +39,7 @@ import (
 	"github.com/edgelesssys/constellation/v2/internal/versions/components"
 	"github.com/edgelesssys/constellation/v2/joinservice/joinproto"
 	"github.com/spf13/afero"
+	"golang.org/x/crypto/ssh"
 	"google.golang.org/grpc"
 	kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3"
 	kubeconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
@@ -209,6 +212,42 @@ func (c *JoinClient) requestJoinTicket(serviceEndpoint string) (ticket *joinprot
 		return nil, nil, err
 	}
 
+	interfaces, err := net.Interfaces()
+	if err != nil {
+		c.log.With(slog.Any("error", err)).Error("Failed to get network interfaces")
+		return nil, nil, err
+	}
+	// Needed since go doesn't implicitly convert slices of structs to slices of interfaces
+	interfacesForFunc := make([]addresses.NetInterface, len(interfaces))
+	for i := range interfaces {
+		interfacesForFunc[i] = &interfaces[i]
+	}
+
+	principalList, err := addresses.GetMachineNetworkAddresses(interfacesForFunc)
+	if err != nil {
+		c.log.With(slog.Any("error", err)).Error("Failed to get network addresses")
+		return nil, nil, err
+	}
+	hostname, err := os.Hostname()
+	if err != nil {
+		c.log.With(slog.Any("error", err)).Error("Failed to get hostname")
+		return nil, nil, err
+	}
+	principalList = append(principalList, hostname)
+
+	hostKeyData, err := c.fileHandler.Read(constants.SSHHostKeyPath)
+	if err != nil {
+		c.log.With(slog.Any("error", err)).Error("Failed to read SSH host key file")
+		return nil, nil, err
+	}
+
+	hostKey, err := ssh.ParsePrivateKey(hostKeyData)
+	if err != nil {
+		c.log.With(slog.Any("error", err)).Error("Failed to parse SSH host key file")
+		return nil, nil, err
+	}
+	hostKeyPubSSH := hostKey.PublicKey()
+
 	conn, err := c.dialer.Dial(serviceEndpoint)
 	if err != nil {
 		c.log.With(slog.String("endpoint", serviceEndpoint), slog.Any("error", err)).Error("Join service unreachable")
@@ -218,9 +257,11 @@ func (c *JoinClient) requestJoinTicket(serviceEndpoint string) (ticket *joinprot
 
 	protoClient := joinproto.NewAPIClient(conn)
 	req := &joinproto.IssueJoinTicketRequest{
-		DiskUuid:           c.diskUUID,
-		CertificateRequest: certificateRequest,
-		IsControlPlane:     c.role == role.ControlPlane,
+		DiskUuid:                  c.diskUUID,
+		CertificateRequest:        certificateRequest,
+		IsControlPlane:            c.role == role.ControlPlane,
+		HostPublicKey:             hostKeyPubSSH.Marshal(),
+		HostCertificatePrincipals: principalList,
 	}
 	ticket, err = protoClient.IssueJoinTicket(ctx, req)
 	if err != nil {
@@ -275,6 +316,10 @@ func (c *JoinClient) startNodeAndJoin(ticket *joinproto.IssueJoinTicketResponse,
 		return fmt.Errorf("writing ssh ca key: %w", err)
 	}
 
+	if err := c.fileHandler.Write(constants.SSHHostCertificatePath, ticket.HostCertificate, file.OptMkdirAll); err != nil {
+		return fmt.Errorf("writing ssh host certificate: %w", err)
+	}
+
 	state := nodestate.NodeState{
 		Role:            c.role,
 		MeasurementSalt: ticket.MeasurementSalt,
diff --git a/bootstrapper/internal/joinclient/joinclient_test.go b/bootstrapper/internal/joinclient/joinclient_test.go
index e652c5165..558c73fbf 100644
--- a/bootstrapper/internal/joinclient/joinclient_test.go
+++ b/bootstrapper/internal/joinclient/joinclient_test.go
@@ -8,7 +8,11 @@ package joinclient
 
 import (
 	"context"
+	"crypto/ed25519"
+	"encoding/pem"
+	"errors"
 	"net"
+	"os"
 	"strconv"
 	"sync"
 	"testing"
@@ -16,6 +20,7 @@ import (
 
 	"github.com/edgelesssys/constellation/v2/internal/cloud/metadata"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
+	"github.com/edgelesssys/constellation/v2/internal/crypto"
 	"github.com/edgelesssys/constellation/v2/internal/file"
 	"github.com/edgelesssys/constellation/v2/internal/grpc/atlscredentials"
 	"github.com/edgelesssys/constellation/v2/internal/grpc/dialer"
@@ -28,6 +33,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
+	"golang.org/x/crypto/ssh"
 	"google.golang.org/grpc"
 	kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3"
 	testclock "k8s.io/utils/clock/testing"
@@ -53,15 +59,70 @@ func TestClient(t *testing.T) {
 	caDerivationKey := make([]byte, 256)
 	respCaKey := &joinproto.IssueJoinTicketResponse{AuthorizedCaPublicKey: caDerivationKey}
 
+	// TODO: fix test since keys are generated with systemd service
+	makeIssueJoinTicketAnswerWithValidCert := func(t *testing.T, originalAnswer issueJoinTicketAnswer, fh file.Handler) issueJoinTicketAnswer {
+		require := require.New(t)
+
+		sshKeyBytes, err := fh.Read(constants.SSHHostKeyPath)
+		require.NoError(err)
+		sshKey, err := ssh.ParsePrivateKey(sshKeyBytes)
+		require.NoError(err)
+		_, randomCAKey, err := ed25519.GenerateKey(nil)
+		require.NoError(err)
+		randomCA, err := ssh.NewSignerFromSigner(randomCAKey)
+		require.NoError(err)
+
+		cert, err := crypto.GenerateSSHHostCertificate([]string{"asdf"}, sshKey.PublicKey(), randomCA)
+		require.NoError(err)
+
+		certBytes := ssh.MarshalAuthorizedKey(cert)
+
+		if originalAnswer.resp == nil {
+			originalAnswer.resp = &joinproto.IssueJoinTicketResponse{HostCertificate: certBytes}
+		} else {
+			originalAnswer.resp.HostCertificate = certBytes
+		}
+
+		return originalAnswer
+	}
+
+	makeIssueJoinTicketAnswerWithInvalidCert := func(t *testing.T, originalAnswer issueJoinTicketAnswer) issueJoinTicketAnswer {
+		require := require.New(t)
+		_, randomCAKey, err := ed25519.GenerateKey(nil)
+		require.NoError(err)
+		randomCA, err := ssh.NewSignerFromSigner(randomCAKey)
+		require.NoError(err)
+
+		randomKey, _, err := ed25519.GenerateKey(nil)
+		require.NoError(err)
+		randomSSHKey, err := ssh.NewPublicKey(randomKey)
+		require.NoError(err)
+
+		cert, err := crypto.GenerateSSHHostCertificate([]string{"asdf"}, randomSSHKey, randomCA)
+		require.NoError(err)
+
+		certBytes := ssh.MarshalAuthorizedKey(cert)
+
+		if originalAnswer.resp == nil {
+			originalAnswer.resp = &joinproto.IssueJoinTicketResponse{HostCertificate: certBytes}
+		} else {
+			originalAnswer.resp.HostCertificate = certBytes
+		}
+
+		return originalAnswer
+	}
+
 	testCases := map[string]struct {
-		role          role.Role
-		clusterJoiner *stubClusterJoiner
-		disk          encryptedDisk
-		nodeLock      *fakeLock
-		apiAnswers    []any
-		wantLock      bool
-		wantJoin      bool
-		wantNumJoins  int
+		role                role.Role
+		clusterJoiner       *stubClusterJoiner
+		disk                encryptedDisk
+		nodeLock            *fakeLock
+		apiAnswers          []any
+		wantLock            bool
+		wantJoin            bool
+		wantNumJoins        int
+		wantNotMatchingCert bool
+		wantCertNotExisting bool
 	}{
 		"on worker: metadata self: errors occur": {
 			role: role.Worker,
@@ -79,6 +140,23 @@ func TestClient(t *testing.T) {
 			wantJoin:      true,
 			wantLock:      true,
 		},
+		"on worker: SSH host cert not matching": {
+			role: role.Worker,
+			apiAnswers: []any{
+				selfAnswer{err: assert.AnError},
+				selfAnswer{err: assert.AnError},
+				selfAnswer{err: assert.AnError},
+				selfAnswer{instance: workerSelf},
+				listAnswer{instances: peers},
+				issueJoinTicketAnswer{resp: respCaKey},
+			},
+			clusterJoiner:       &stubClusterJoiner{},
+			nodeLock:            newFakeLock(),
+			disk:                &stubDisk{},
+			wantJoin:            true,
+			wantLock:            true,
+			wantNotMatchingCert: true,
+		},
 		"on worker: metadata self: invalid answer": {
 			role: role.Worker,
 			apiAnswers: []any{
@@ -195,33 +273,43 @@ func TestClient(t *testing.T) {
 				listAnswer{instances: peers},
 				issueJoinTicketAnswer{resp: respCaKey},
 			},
-			clusterJoiner: &stubClusterJoiner{},
-			nodeLock:      lockedLock,
-			disk:          &stubDisk{},
-			wantLock:      true,
+			clusterJoiner:       &stubClusterJoiner{},
+			nodeLock:            lockedLock,
+			disk:                &stubDisk{},
+			wantLock:            true,
+			wantCertNotExisting: true,
 		},
 		"on control plane: disk open fails": {
-			role:          role.ControlPlane,
-			clusterJoiner: &stubClusterJoiner{},
-			nodeLock:      newFakeLock(),
-			disk:          &stubDisk{openErr: assert.AnError},
+			role:                role.ControlPlane,
+			clusterJoiner:       &stubClusterJoiner{},
+			nodeLock:            newFakeLock(),
+			disk:                &stubDisk{openErr: assert.AnError},
+			wantCertNotExisting: true,
 		},
 		"on control plane: disk uuid fails": {
-			role:          role.ControlPlane,
-			clusterJoiner: &stubClusterJoiner{},
-			nodeLock:      newFakeLock(),
-			disk:          &stubDisk{uuidErr: assert.AnError},
+			role:                role.ControlPlane,
+			clusterJoiner:       &stubClusterJoiner{},
+			nodeLock:            newFakeLock(),
+			disk:                &stubDisk{uuidErr: assert.AnError},
+			wantCertNotExisting: true,
 		},
 	}
 
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
 			assert := assert.New(t)
+			require := require.New(t)
 
 			clock := testclock.NewFakeClock(time.Now())
 			metadataAPI := newStubMetadataAPI()
 			fileHandler := file.NewHandler(afero.NewMemMapFs())
 
+			_, hostKey, err := ed25519.GenerateKey(nil)
+			require.NoError(err)
+			hostKeyPEM, err := ssh.MarshalPrivateKey(hostKey, "hostkey")
+			require.NoError(err)
+			require.NoError(fileHandler.Write(constants.SSHHostKeyPath, pem.EncodeToMemory(hostKeyPEM), file.OptMkdirAll))
+
 			netDialer := testdialer.NewBufconnDialer()
 			dialer := dialer.New(nil, nil, netDialer)
 
@@ -259,13 +347,43 @@ func TestClient(t *testing.T) {
 				case listAnswer:
 					metadataAPI.listAnswerC <- a
 				case issueJoinTicketAnswer:
-					joinserviceAPI.issueJoinTicketAnswerC <- a
+					var answer issueJoinTicketAnswer
+					if tc.wantNotMatchingCert {
+						answer = makeIssueJoinTicketAnswerWithInvalidCert(t, a)
+					} else {
+						answer = makeIssueJoinTicketAnswerWithValidCert(t, a, fileHandler)
+					}
+					joinserviceAPI.issueJoinTicketAnswerC <- answer
 				}
 				clock.Step(time.Second)
 			}
 
 			client.Stop()
 
+			if !tc.wantCertNotExisting {
+				hostCertBytes, err := fileHandler.Read(constants.SSHHostCertificatePath)
+				require.NoError(err)
+				hostKeyBytes, err := fileHandler.Read(constants.SSHHostKeyPath)
+				require.NoError(err)
+
+				hostCertKey, _, _, _, err := ssh.ParseAuthorizedKey(hostCertBytes)
+				require.NoError(err)
+				hostCert, ok := hostCertKey.(*ssh.Certificate)
+				require.True(ok)
+
+				hostKey, err := ssh.ParsePrivateKey(hostKeyBytes)
+				require.NoError(err)
+
+				if !tc.wantNotMatchingCert {
+					assert.Equal(hostKey.PublicKey().Marshal(), hostCert.Key.Marshal())
+				} else {
+					assert.NotEqual(hostKey.PublicKey().Marshal(), hostCert.Key.Marshal())
+				}
+			} else {
+				_, err := fileHandler.Stat(constants.SSHHostCertificatePath)
+				require.True(errors.Is(err, os.ErrNotExist))
+			}
+
 			if tc.wantJoin {
 				assert.Greater(tc.clusterJoiner.joinClusterCalled, 0)
 			} else {
diff --git a/cli/internal/cmd/ssh.go b/cli/internal/cmd/ssh.go
index 33ebabfaa..e1e641902 100644
--- a/cli/internal/cmd/ssh.go
+++ b/cli/internal/cmd/ssh.go
@@ -74,7 +74,12 @@ func writeCertificateForKey(cmd *cobra.Command, keyPath string, fh file.Handler,
 		return fmt.Errorf("generating SSH emergency CA key: %s", err)
 	}
 
-	debugLogger.Debug("SSH CA KEY generated", "public-key", string(ssh.MarshalAuthorizedKey(ca.PublicKey())))
+	marshalledKey := string(ssh.MarshalAuthorizedKey(ca.PublicKey()))
+	debugLogger.Debug("SSH CA KEY generated", "public-key", marshalledKey)
+	knownHostsContent := fmt.Sprintf("@cert-authority * %s", marshalledKey)
+	if err := fh.Write("./known_hosts", []byte(knownHostsContent), file.OptMkdirAll); err != nil {
+		return fmt.Errorf("writing known hosts file: %w", err)
+	}
 
 	keyBuffer, err := fh.Read(keyPath)
 	if err != nil {
diff --git a/docs/docs/workflows/troubleshooting.md b/docs/docs/workflows/troubleshooting.md
index 903c829e0..7ed26ae7f 100644
--- a/docs/docs/workflows/troubleshooting.md
+++ b/docs/docs/workflows/troubleshooting.md
@@ -177,7 +177,7 @@ Emergency SSH access to nodes can be useful to diagnose issues or download impor
 3. Now you can connect to any Constellation node using your certificate and your private key.
 
    ```bash
-   ssh -o CertificateFile=constellation_cert.pub -i <your private key> root@<ip of constellation node>
+   ssh -o CertificateFile=constellation_cert.pub -o UserKnownHostsFile=./known_hosts -i <your private key> root@<ip of constellation node>
    ```
 
    Normally, you don't have access to the Constellation nodes since they reside in a private network.
@@ -185,16 +185,18 @@ Emergency SSH access to nodes can be useful to diagnose issues or download impor
    For this, use something along the following SSH client configuration:
 
    ```text
-   Host <LB domain name>
+   Host <LB public IP>
      ProxyJump none
 
    Host *
      IdentityFile <your private key>
      PreferredAuthentications publickey
      CertificateFile=constellation_cert.pub
+     UserKnownHostsFile=./known_hosts
      User root
-     ProxyJump <LB domain name>
+     ProxyJump <LB public IP>
    ```
 
    With this configuration you can connect to a Constellation node using `ssh -F <this config> <private node IP>`.
-   You can obtain the private node IP and the domain name of the load balancer using your CSP's web UI.
+   You can obtain the private node IP and the public IP of the load balancer using your CSP's web UI. Note that if
+   you use the load balancers domain name, ssh host certificate verification doesn't work, so using the public IP is recommended.
diff --git a/image/base/mkosi.skeleton/usr/lib/systemd/system-preset/30-constellation.preset b/image/base/mkosi.skeleton/usr/lib/systemd/system-preset/30-constellation.preset
index 493434d54..dcabbedd9 100644
--- a/image/base/mkosi.skeleton/usr/lib/systemd/system-preset/30-constellation.preset
+++ b/image/base/mkosi.skeleton/usr/lib/systemd/system-preset/30-constellation.preset
@@ -10,4 +10,3 @@ enable measurements.service
 enable export_constellation_debug.service
 enable systemd-timesyncd
 enable udev-trigger.service
-enable create-host-ssh-key.service
diff --git a/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-bootstrapper.service b/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-bootstrapper.service
index cf93df780..30ca0acfe 100644
--- a/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-bootstrapper.service
+++ b/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-bootstrapper.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Constellation Bootstrapper
 Wants=network-online.target
-After=network-online.target configure-constel-csp.service
+Requires=sshd-keygen.target
+After=network-online.target configure-constel-csp.service sshd-keygen.target
 After=export_constellation_debug.service
 
 [Service]
diff --git a/image/base/mkosi.skeleton/usr/lib/systemd/system/create-host-ssh-key.service b/image/base/mkosi.skeleton/usr/lib/systemd/system/create-host-ssh-key.service
deleted file mode 100644
index 28a0862e7..000000000
--- a/image/base/mkosi.skeleton/usr/lib/systemd/system/create-host-ssh-key.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Create a host SSH key
-Before=network-pre.target
-
-[Service]
-Type=oneshot
-ExecStart=/bin/bash -c "mkdir -p /run/ssh; ssh-keygen -t ecdsa -q -N '' -f /run/ssh/ssh_host_ecdsa_key"
-
-[Install]
-WantedBy=network-pre.target
diff --git a/image/sysroot-tree/etc/ssh/sshd_config b/image/sysroot-tree/etc/ssh/sshd_config
index dec4fd51d..39016f323 100644
--- a/image/sysroot-tree/etc/ssh/sshd_config
+++ b/image/sysroot-tree/etc/ssh/sshd_config
@@ -1,4 +1,5 @@
-HostKey /run/ssh/ssh_host_ecdsa_key
-TrustedUserCAKeys /run/ssh/ssh_ca.pub
+HostKey /var/run/state/ssh/ssh_host_ed25519_key
+HostCertificate /var/run/state/ssh/ssh_host_cert.pub
+TrustedUserCAKeys /var/run/state/ssh/ssh_ca.pub
 PasswordAuthentication no
 ChallengeResponseAuthentication no
diff --git a/image/sysroot-tree/etc/systemd/system/sshd-keygen@.service.d/override.conf b/image/sysroot-tree/etc/systemd/system/sshd-keygen@.service.d/override.conf
new file mode 100644
index 000000000..1e956c08b
--- /dev/null
+++ b/image/sysroot-tree/etc/systemd/system/sshd-keygen@.service.d/override.conf
@@ -0,0 +1,3 @@
+[Unit]
+ConditionFileNotEmpty=|!/var/run/state/ssh/ssh_host_%i_key
+Before=constellation-bootstrapper.service
diff --git a/image/sysroot-tree/usr/lib/systemd/system/sshd-keygen.target b/image/sysroot-tree/usr/lib/systemd/system/sshd-keygen.target
new file mode 100644
index 000000000..3c4dd2b1c
--- /dev/null
+++ b/image/sysroot-tree/usr/lib/systemd/system/sshd-keygen.target
@@ -0,0 +1,3 @@
+[Unit]
+Wants=sshd-keygen@ed25519.service
+PartOf=sshd.service
diff --git a/image/sysroot-tree/usr/libexec/openssh/sshd-keygen b/image/sysroot-tree/usr/libexec/openssh/sshd-keygen
new file mode 100644
index 000000000..c366b0d0a
--- /dev/null
+++ b/image/sysroot-tree/usr/libexec/openssh/sshd-keygen
@@ -0,0 +1,44 @@
+#!/usr/bin/bash
+# Taken from the original openssh-server package and slightly modified
+
+set -x
+
+# Create the host keys for the OpenSSH server.
+KEYTYPE=$1
+case $KEYTYPE in
+"dsa") ;& # disabled in FIPS
+"ed25519")
+  FIPS=/proc/sys/crypto/fips_enabled
+  if [[ -r $FIPS && $(cat $FIPS) == "1" ]]; then
+    exit 0
+  fi
+  ;;
+"rsa") ;; # always ok
+"ecdsa") ;;
+*) # wrong argument
+  exit 12 ;;
+esac
+mkdir -p /var/run/state/ssh
+KEY=/var/run/state/ssh/ssh_host_${KEYTYPE}_key
+
+KEYGEN=/usr/bin/ssh-keygen
+if [[ ! -x $KEYGEN ]]; then
+  exit 13
+fi
+
+# remove old keys
+rm -f "$KEY"{,.pub}
+
+# create new keys
+if ! $KEYGEN -q -t "$KEYTYPE" -f "$KEY" -C '' -N '' >&/dev/null; then
+  exit 1
+fi
+
+# sanitize permissions
+/usr/bin/chmod 600 "$KEY"
+/usr/bin/chmod 644 "$KEY".pub
+if [[ -x /usr/sbin/restorecon ]]; then
+  /usr/sbin/restorecon "$KEY"{,.pub}
+fi
+
+exit 0
diff --git a/internal/constants/constants.go b/internal/constants/constants.go
index aecef23c8..c86a3883f 100644
--- a/internal/constants/constants.go
+++ b/internal/constants/constants.go
@@ -45,7 +45,13 @@ const (
 	// SSHCAKeySuffix is the suffix used together with the DEKPrefix to derive an SSH CA key for emergency ssh access.
 	SSHCAKeySuffix = "ca_emergency_ssh"
 	// SSHCAKeyPath is the path to the emergency SSH CA key on the node.
-	SSHCAKeyPath = "/run/ssh/ssh_ca.pub"
+	SSHCAKeyPath = "/var/run/state/ssh/ssh_ca.pub"
+	// SSHHostKeyPath is the path to the SSH host key of the node.
+	SSHHostKeyPath = "/var/run/state/ssh/ssh_host_ed25519_key"
+	// SSHHostCertificatePath is the path to the SSH host certificate.
+	SSHHostCertificatePath = "/var/run/state/ssh/ssh_host_cert.pub"
+	// SSHAdditionalPrincipalsPath stores additional principals (like the public IP of the load balancer) that get added to all host certificates.
+	SSHAdditionalPrincipalsPath = "/var/run/state/ssh/additional_principals.txt"
 
 	//
 	// Ports.
diff --git a/internal/constellation/helm/charts/edgeless/constellation-services/charts/join-service/templates/daemonset.yaml b/internal/constellation/helm/charts/edgeless/constellation-services/charts/join-service/templates/daemonset.yaml
index 5eed603c5..a7bfe1656 100644
--- a/internal/constellation/helm/charts/edgeless/constellation-services/charts/join-service/templates/daemonset.yaml
+++ b/internal/constellation/helm/charts/edgeless/constellation-services/charts/join-service/templates/daemonset.yaml
@@ -53,6 +53,8 @@ spec:
             - mountPath: /var/secrets/google
               name: gcekey
               readOnly: true
+            - mountPath: /var/run/state/ssh
+              name: ssh
           ports:
             - containerPort: {{ .Values.joinServicePort }}
               name: tcp
@@ -74,4 +76,7 @@ spec:
         - name: kubeadm
           hostPath:
             path: /etc/kubernetes
+        - name: ssh
+          hostPath:
+            path: /var/run/state/ssh
   updateStrategy: {}
diff --git a/internal/constellation/helm/testdata/AWS/constellation-services/charts/join-service/templates/daemonset.yaml b/internal/constellation/helm/testdata/AWS/constellation-services/charts/join-service/templates/daemonset.yaml
index 7c65a887f..046ae08e6 100644
--- a/internal/constellation/helm/testdata/AWS/constellation-services/charts/join-service/templates/daemonset.yaml
+++ b/internal/constellation/helm/testdata/AWS/constellation-services/charts/join-service/templates/daemonset.yaml
@@ -53,6 +53,8 @@ spec:
             - mountPath: /var/secrets/google
               name: gcekey
               readOnly: true
+            - mountPath: /var/run/state/ssh
+              name: ssh
           ports:
             - containerPort: 9090
               name: tcp
@@ -74,4 +76,7 @@ spec:
         - name: kubeadm
           hostPath:
             path: /etc/kubernetes
+        - name: ssh
+          hostPath:
+            path: /var/run/state/ssh
   updateStrategy: {}
diff --git a/internal/constellation/helm/testdata/Azure/constellation-services/charts/join-service/templates/daemonset.yaml b/internal/constellation/helm/testdata/Azure/constellation-services/charts/join-service/templates/daemonset.yaml
index 361089daa..80e151886 100644
--- a/internal/constellation/helm/testdata/Azure/constellation-services/charts/join-service/templates/daemonset.yaml
+++ b/internal/constellation/helm/testdata/Azure/constellation-services/charts/join-service/templates/daemonset.yaml
@@ -53,6 +53,8 @@ spec:
             - mountPath: /var/secrets/google
               name: gcekey
               readOnly: true
+            - mountPath: /var/run/state/ssh
+              name: ssh
           ports:
             - containerPort: 9090
               name: tcp
@@ -74,4 +76,7 @@ spec:
         - name: kubeadm
           hostPath:
             path: /etc/kubernetes
+        - name: ssh
+          hostPath:
+            path: /var/run/state/ssh
   updateStrategy: {}
diff --git a/internal/constellation/helm/testdata/GCP/constellation-services/charts/join-service/templates/daemonset.yaml b/internal/constellation/helm/testdata/GCP/constellation-services/charts/join-service/templates/daemonset.yaml
index d50416871..c16d77b4f 100644
--- a/internal/constellation/helm/testdata/GCP/constellation-services/charts/join-service/templates/daemonset.yaml
+++ b/internal/constellation/helm/testdata/GCP/constellation-services/charts/join-service/templates/daemonset.yaml
@@ -53,6 +53,8 @@ spec:
             - mountPath: /var/secrets/google
               name: gcekey
               readOnly: true
+            - mountPath: /var/run/state/ssh
+              name: ssh
           ports:
             - containerPort: 9090
               name: tcp
@@ -74,4 +76,7 @@ spec:
         - name: kubeadm
           hostPath:
             path: /etc/kubernetes
+        - name: ssh
+          hostPath:
+            path: /var/run/state/ssh
   updateStrategy: {}
diff --git a/internal/constellation/helm/testdata/OpenStack/constellation-services/charts/join-service/templates/daemonset.yaml b/internal/constellation/helm/testdata/OpenStack/constellation-services/charts/join-service/templates/daemonset.yaml
index 96258cbe2..c77b395b1 100644
--- a/internal/constellation/helm/testdata/OpenStack/constellation-services/charts/join-service/templates/daemonset.yaml
+++ b/internal/constellation/helm/testdata/OpenStack/constellation-services/charts/join-service/templates/daemonset.yaml
@@ -53,6 +53,8 @@ spec:
             - mountPath: /var/secrets/google
               name: gcekey
               readOnly: true
+            - mountPath: /var/run/state/ssh
+              name: ssh
           ports:
             - containerPort: 9090
               name: tcp
@@ -74,4 +76,7 @@ spec:
         - name: kubeadm
           hostPath:
             path: /etc/kubernetes
+        - name: ssh
+          hostPath:
+            path: /var/run/state/ssh
   updateStrategy: {}
diff --git a/internal/constellation/helm/testdata/QEMU/constellation-services/charts/join-service/templates/daemonset.yaml b/internal/constellation/helm/testdata/QEMU/constellation-services/charts/join-service/templates/daemonset.yaml
index b1db9147f..7e8443eb4 100644
--- a/internal/constellation/helm/testdata/QEMU/constellation-services/charts/join-service/templates/daemonset.yaml
+++ b/internal/constellation/helm/testdata/QEMU/constellation-services/charts/join-service/templates/daemonset.yaml
@@ -53,6 +53,8 @@ spec:
             - mountPath: /var/secrets/google
               name: gcekey
               readOnly: true
+            - mountPath: /var/run/state/ssh
+              name: ssh
           ports:
             - containerPort: 9090
               name: tcp
@@ -74,4 +76,7 @@ spec:
         - name: kubeadm
           hostPath:
             path: /etc/kubernetes
+        - name: ssh
+          hostPath:
+            path: /var/run/state/ssh
   updateStrategy: {}
diff --git a/internal/crypto/crypto.go b/internal/crypto/crypto.go
index 0a88ec2f5..e367b67ab 100644
--- a/internal/crypto/crypto.go
+++ b/internal/crypto/crypto.go
@@ -17,6 +17,7 @@ import (
 	"fmt"
 	"io"
 	"math/big"
+	"time"
 
 	"golang.org/x/crypto/hkdf"
 	"golang.org/x/crypto/ssh"
@@ -77,6 +78,28 @@ func GenerateEmergencySSHCAKey(seed []byte) (ssh.Signer, error) {
 	return ca, nil
 }
 
+// GenerateSSHHostCertificate takes a given public key and CA to generate a host certificate.
+func GenerateSSHHostCertificate(principals []string, publicKey ssh.PublicKey, ca ssh.Signer) (*ssh.Certificate, error) {
+	certificate := ssh.Certificate{
+		CertType:        ssh.HostCert,
+		ValidPrincipals: principals,
+		ValidAfter:      uint64(time.Now().Unix()),
+		ValidBefore:     ssh.CertTimeInfinity,
+		Reserved:        []byte{},
+		Key:             publicKey,
+		KeyId:           principals[0],
+		Permissions: ssh.Permissions{
+			CriticalOptions: map[string]string{},
+			Extensions:      map[string]string{},
+		},
+	}
+	if err := certificate.SignCert(rand.Reader, ca); err != nil {
+		return nil, err
+	}
+
+	return &certificate, nil
+}
+
 // PemToX509Cert takes a list of PEM-encoded certificates, parses the first one and returns it
 // as an x.509 certificate.
 func PemToX509Cert(raw []byte) (*x509.Certificate, error) {
diff --git a/joinservice/cmd/main.go b/joinservice/cmd/main.go
index 8aaab9654..6df8ca3d8 100644
--- a/joinservice/cmd/main.go
+++ b/joinservice/cmd/main.go
@@ -116,6 +116,7 @@ func main() {
 		keyServiceClient,
 		kubeClient,
 		log.WithGroup("server"),
+		file.NewHandler(afero.NewOsFs()),
 	)
 	if err != nil {
 		log.With(slog.Any("error", err)).Error("Failed to create server")
diff --git a/joinservice/internal/server/BUILD.bazel b/joinservice/internal/server/BUILD.bazel
index eed06e663..c7835f7ef 100644
--- a/joinservice/internal/server/BUILD.bazel
+++ b/joinservice/internal/server/BUILD.bazel
@@ -10,6 +10,7 @@ go_library(
         "//internal/attestation",
         "//internal/constants",
         "//internal/crypto",
+        "//internal/file",
         "//internal/grpc/grpclog",
         "//internal/logger",
         "//internal/versions/components",
@@ -30,12 +31,15 @@ go_test(
     deps = [
         "//internal/attestation",
         "//internal/constants",
+        "//internal/file",
         "//internal/logger",
         "//internal/versions/components",
         "//joinservice/joinproto",
+        "@com_github_spf13_afero//:afero",
         "@com_github_stretchr_testify//assert",
         "@com_github_stretchr_testify//require",
         "@io_k8s_kubernetes//cmd/kubeadm/app/apis/kubeadm/v1beta3",
+        "@org_golang_x_crypto//ssh",
         "@org_uber_go_goleak//:goleak",
     ],
 )
diff --git a/joinservice/internal/server/server.go b/joinservice/internal/server/server.go
index e6fc82b95..12d03e1ca 100644
--- a/joinservice/internal/server/server.go
+++ b/joinservice/internal/server/server.go
@@ -13,11 +13,13 @@ import (
 	"fmt"
 	"log/slog"
 	"net"
+	"strings"
 	"time"
 
 	"github.com/edgelesssys/constellation/v2/internal/attestation"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
 	"github.com/edgelesssys/constellation/v2/internal/crypto"
+	"github.com/edgelesssys/constellation/v2/internal/file"
 	"github.com/edgelesssys/constellation/v2/internal/grpc/grpclog"
 	"github.com/edgelesssys/constellation/v2/internal/logger"
 	"github.com/edgelesssys/constellation/v2/internal/versions/components"
@@ -40,6 +42,7 @@ type Server struct {
 	dataKeyGetter   dataKeyGetter
 	ca              certificateAuthority
 	kubeClient      kubeClient
+	fileHandler     file.Handler
 	joinproto.UnimplementedAPIServer
 }
 
@@ -47,6 +50,7 @@ type Server struct {
 func New(
 	measurementSalt []byte, ca certificateAuthority,
 	joinTokenGetter joinTokenGetter, dataKeyGetter dataKeyGetter, kubeClient kubeClient, log *slog.Logger,
+	fileHandler file.Handler,
 ) (*Server, error) {
 	return &Server{
 		measurementSalt: measurementSalt,
@@ -55,6 +59,7 @@ func New(
 		dataKeyGetter:   dataKeyGetter,
 		ca:              ca,
 		kubeClient:      kubeClient,
+		fileHandler:     fileHandler,
 	}, nil
 }
 
@@ -114,6 +119,25 @@ func (s *Server) IssueJoinTicket(ctx context.Context, req *joinproto.IssueJoinTi
 		return nil, status.Errorf(codes.Internal, "generating ssh emergency CA key: %s", err)
 	}
 
+	principalList := req.HostCertificatePrincipals
+	additionalPrincipals, err := s.fileHandler.Read(constants.SSHAdditionalPrincipalsPath)
+	if err != nil {
+		log.With(slog.Any("error", err)).Error("Failed to read additional principals file")
+		return nil, status.Errorf(codes.Internal, "reading additional principals file: %s", err)
+	}
+	principalList = append(principalList, strings.Split(string(additionalPrincipals), ",")...)
+
+	publicKey, err := ssh.ParsePublicKey(req.HostPublicKey)
+	if err != nil {
+		log.With(slog.Any("error", err)).Error("Failed to parse host public key")
+		return nil, status.Errorf(codes.Internal, "unmarshalling host public key: %s", err)
+	}
+	hostCertificate, err := crypto.GenerateSSHHostCertificate(principalList, publicKey, ca)
+	if err != nil {
+		log.With(slog.Any("error", err)).Error("Failed to generate and sign SSH host key")
+		return nil, status.Errorf(codes.Internal, "generating and signing SSH host key: %s", err)
+	}
+
 	log.Info("Creating Kubernetes join token")
 	kubeArgs, err := s.joinTokenGetter.GetJoinToken(constants.KubernetesJoinTokenTTL)
 	if err != nil {
@@ -182,6 +206,7 @@ func (s *Server) IssueJoinTicket(ctx context.Context, req *joinproto.IssueJoinTi
 		ControlPlaneFiles:        controlPlaneFiles,
 		KubernetesComponents:     components,
 		AuthorizedCaPublicKey:    ssh.MarshalAuthorizedKey(ca.PublicKey()),
+		HostCertificate:          ssh.MarshalAuthorizedKey(hostCertificate),
 	}, nil
 }
 
diff --git a/joinservice/internal/server/server_test.go b/joinservice/internal/server/server_test.go
index 4fbf0c5b6..63e852d19 100644
--- a/joinservice/internal/server/server_test.go
+++ b/joinservice/internal/server/server_test.go
@@ -15,12 +15,15 @@ import (
 
 	"github.com/edgelesssys/constellation/v2/internal/attestation"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
+	"github.com/edgelesssys/constellation/v2/internal/file"
 	"github.com/edgelesssys/constellation/v2/internal/logger"
 	"github.com/edgelesssys/constellation/v2/internal/versions/components"
 	"github.com/edgelesssys/constellation/v2/joinservice/joinproto"
+	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
+	"golang.org/x/crypto/ssh"
 	kubeadmv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3"
 )
 
@@ -36,6 +39,11 @@ func TestIssueJoinTicket(t *testing.T) {
 	measurementSecret := []byte{0x7, 0x8, 0x9}
 	uuid := "uuid"
 
+	pubkey, _, err := ed25519.GenerateKey(nil)
+	require.NoError(t, err)
+	hostSSHPubKey, err := ssh.NewPublicKey(pubkey)
+	require.NoError(t, err)
+
 	testJoinToken := &kubeadmv1.BootstrapTokenDiscovery{
 		APIServerEndpoint: "192.0.2.1",
 		CACertHashes:      []string{"hash"},
@@ -52,13 +60,15 @@ func TestIssueJoinTicket(t *testing.T) {
 	}
 
 	testCases := map[string]struct {
-		isControlPlane                 bool
-		kubeadm                        stubTokenGetter
-		kms                            stubKeyGetter
-		ca                             stubCA
-		kubeClient                     stubKubeClient
-		missingComponentsReferenceFile bool
-		wantErr                        bool
+		isControlPlane                  bool
+		kubeadm                         stubTokenGetter
+		kms                             stubKeyGetter
+		ca                              stubCA
+		kubeClient                      stubKubeClient
+		missingComponentsReferenceFile  bool
+		missingAdditionalPrincipalsFile bool
+		missingSSHHostKey               bool
+		wantErr                         bool
 	}{
 		"worker node": {
 			kubeadm: stubTokenGetter{token: testJoinToken},
@@ -179,6 +189,30 @@ func TestIssueJoinTicket(t *testing.T) {
 			kubeClient: stubKubeClient{getComponentsVal: clusterComponents, getK8sComponentsRefFromNodeVersionCRDVal: "k8s-components-ref"},
 			wantErr:    true,
 		},
+		"Additional principals file is missing": {
+			kubeadm: stubTokenGetter{token: testJoinToken},
+			kms: stubKeyGetter{dataKeys: map[string][]byte{
+				uuid:                                 testKey,
+				attestation.MeasurementSecretContext: measurementSecret,
+				constants.SSHCAKeySuffix:             testCaKey,
+			}},
+			ca:                              stubCA{cert: testCert, nodeName: "node"},
+			kubeClient:                      stubKubeClient{getComponentsVal: clusterComponents, getK8sComponentsRefFromNodeVersionCRDVal: "k8s-components-ref"},
+			missingAdditionalPrincipalsFile: true,
+			wantErr:                         true,
+		},
+		"Host pubkey is missing": {
+			kubeadm: stubTokenGetter{token: testJoinToken},
+			kms: stubKeyGetter{dataKeys: map[string][]byte{
+				uuid:                                 testKey,
+				attestation.MeasurementSecretContext: measurementSecret,
+				constants.SSHCAKeySuffix:             testCaKey,
+			}},
+			ca:                stubCA{cert: testCert, nodeName: "node"},
+			kubeClient:        stubKubeClient{getComponentsVal: clusterComponents, getK8sComponentsRefFromNodeVersionCRDVal: "k8s-components-ref"},
+			missingSSHHostKey: true,
+			wantErr:           true,
+		},
 	}
 
 	for name, tc := range testCases {
@@ -188,6 +222,11 @@ func TestIssueJoinTicket(t *testing.T) {
 
 			salt := []byte{0xA, 0xB, 0xC}
 
+			fh := file.NewHandler(afero.NewMemMapFs())
+			if !tc.missingAdditionalPrincipalsFile {
+				require.NoError(fh.Write(constants.SSHAdditionalPrincipalsPath, []byte("*"), file.OptMkdirAll))
+			}
+
 			api := Server{
 				measurementSalt: salt,
 				ca:              tc.ca,
@@ -195,11 +234,20 @@ func TestIssueJoinTicket(t *testing.T) {
 				dataKeyGetter:   tc.kms,
 				kubeClient:      &tc.kubeClient,
 				log:             logger.NewTest(t),
+				fileHandler:     fh,
+			}
+
+			var keyToSend []byte
+			if tc.missingSSHHostKey {
+				keyToSend = nil
+			} else {
+				keyToSend = hostSSHPubKey.Marshal()
 			}
 
 			req := &joinproto.IssueJoinTicketRequest{
 				DiskUuid:       "uuid",
 				IsControlPlane: tc.isControlPlane,
+				HostPublicKey:  keyToSend,
 			}
 			resp, err := api.IssueJoinTicket(t.Context(), req)
 			if tc.wantErr {
@@ -260,6 +308,7 @@ func TestIssueRejoinTicker(t *testing.T) {
 				joinTokenGetter: stubTokenGetter{},
 				dataKeyGetter:   tc.keyGetter,
 				log:             logger.NewTest(t),
+				fileHandler:     file.NewHandler(afero.NewMemMapFs()),
 			}
 
 			req := &joinproto.IssueRejoinTicketRequest{
diff --git a/joinservice/joinproto/join.pb.go b/joinservice/joinproto/join.pb.go
index 9c8af76d7..a620ccbd5 100644
--- a/joinservice/joinproto/join.pb.go
+++ b/joinservice/joinproto/join.pb.go
@@ -27,12 +27,14 @@ const (
 )
 
 type IssueJoinTicketRequest struct {
-	state              protoimpl.MessageState `protogen:"open.v1"`
-	DiskUuid           string                 `protobuf:"bytes,1,opt,name=disk_uuid,json=diskUuid,proto3" json:"disk_uuid,omitempty"`
-	CertificateRequest []byte                 `protobuf:"bytes,2,opt,name=certificate_request,json=certificateRequest,proto3" json:"certificate_request,omitempty"`
-	IsControlPlane     bool                   `protobuf:"varint,3,opt,name=is_control_plane,json=isControlPlane,proto3" json:"is_control_plane,omitempty"`
-	unknownFields      protoimpl.UnknownFields
-	sizeCache          protoimpl.SizeCache
+	state                     protoimpl.MessageState `protogen:"open.v1"`
+	DiskUuid                  string                 `protobuf:"bytes,1,opt,name=disk_uuid,json=diskUuid,proto3" json:"disk_uuid,omitempty"`
+	CertificateRequest        []byte                 `protobuf:"bytes,2,opt,name=certificate_request,json=certificateRequest,proto3" json:"certificate_request,omitempty"`
+	IsControlPlane            bool                   `protobuf:"varint,3,opt,name=is_control_plane,json=isControlPlane,proto3" json:"is_control_plane,omitempty"`
+	HostPublicKey             []byte                 `protobuf:"bytes,4,opt,name=host_public_key,json=hostPublicKey,proto3" json:"host_public_key,omitempty"`
+	HostCertificatePrincipals []string               `protobuf:"bytes,5,rep,name=host_certificate_principals,json=hostCertificatePrincipals,proto3" json:"host_certificate_principals,omitempty"`
+	unknownFields             protoimpl.UnknownFields
+	sizeCache                 protoimpl.SizeCache
 }
 
 func (x *IssueJoinTicketRequest) Reset() {
@@ -86,6 +88,20 @@ func (x *IssueJoinTicketRequest) GetIsControlPlane() bool {
 	return false
 }
 
+func (x *IssueJoinTicketRequest) GetHostPublicKey() []byte {
+	if x != nil {
+		return x.HostPublicKey
+	}
+	return nil
+}
+
+func (x *IssueJoinTicketRequest) GetHostCertificatePrincipals() []string {
+	if x != nil {
+		return x.HostCertificatePrincipals
+	}
+	return nil
+}
+
 type IssueJoinTicketResponse struct {
 	state                    protoimpl.MessageState   `protogen:"open.v1"`
 	StateDiskKey             []byte                   `protobuf:"bytes,1,opt,name=state_disk_key,json=stateDiskKey,proto3" json:"state_disk_key,omitempty"`
@@ -99,6 +115,7 @@ type IssueJoinTicketResponse struct {
 	KubernetesVersion        string                   `protobuf:"bytes,9,opt,name=kubernetes_version,json=kubernetesVersion,proto3" json:"kubernetes_version,omitempty"`
 	KubernetesComponents     []*components.Component  `protobuf:"bytes,10,rep,name=kubernetes_components,json=kubernetesComponents,proto3" json:"kubernetes_components,omitempty"`
 	AuthorizedCaPublicKey    []byte                   `protobuf:"bytes,11,opt,name=authorized_ca_public_key,json=authorizedCaPublicKey,proto3" json:"authorized_ca_public_key,omitempty"`
+	HostCertificate          []byte                   `protobuf:"bytes,12,opt,name=host_certificate,json=hostCertificate,proto3" json:"host_certificate,omitempty"`
 	unknownFields            protoimpl.UnknownFields
 	sizeCache                protoimpl.SizeCache
 }
@@ -210,6 +227,13 @@ func (x *IssueJoinTicketResponse) GetAuthorizedCaPublicKey() []byte {
 	return nil
 }
 
+func (x *IssueJoinTicketResponse) GetHostCertificate() []byte {
+	if x != nil {
+		return x.HostCertificate
+	}
+	return nil
+}
+
 type ControlPlaneCertOrKey struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
@@ -362,11 +386,13 @@ var File_joinservice_joinproto_join_proto protoreflect.FileDescriptor
 
 const file_joinservice_joinproto_join_proto_rawDesc = "" +
 	"\n" +
-	" joinservice/joinproto/join.proto\x12\x04join\x1a-internal/versions/components/components.proto\"\x90\x01\n" +
+	" joinservice/joinproto/join.proto\x12\x04join\x1a-internal/versions/components/components.proto\"\xf8\x01\n" +
 	"\x16IssueJoinTicketRequest\x12\x1b\n" +
 	"\tdisk_uuid\x18\x01 \x01(\tR\bdiskUuid\x12/\n" +
 	"\x13certificate_request\x18\x02 \x01(\fR\x12certificateRequest\x12(\n" +
-	"\x10is_control_plane\x18\x03 \x01(\bR\x0eisControlPlane\"\xc7\x04\n" +
+	"\x10is_control_plane\x18\x03 \x01(\bR\x0eisControlPlane\x12&\n" +
+	"\x0fhost_public_key\x18\x04 \x01(\fR\rhostPublicKey\x12>\n" +
+	"\x1bhost_certificate_principals\x18\x05 \x03(\tR\x19hostCertificatePrincipals\"\xf2\x04\n" +
 	"\x17IssueJoinTicketResponse\x12$\n" +
 	"\x0estate_disk_key\x18\x01 \x01(\fR\fstateDiskKey\x12)\n" +
 	"\x10measurement_salt\x18\x02 \x01(\fR\x0fmeasurementSalt\x12-\n" +
@@ -379,7 +405,8 @@ const file_joinservice_joinproto_join_proto_rawDesc = "" +
 	"\x12kubernetes_version\x18\t \x01(\tR\x11kubernetesVersion\x12J\n" +
 	"\x15kubernetes_components\x18\n" +
 	" \x03(\v2\x15.components.ComponentR\x14kubernetesComponents\x127\n" +
-	"\x18authorized_ca_public_key\x18\v \x01(\fR\x15authorizedCaPublicKey\"C\n" +
+	"\x18authorized_ca_public_key\x18\v \x01(\fR\x15authorizedCaPublicKey\x12)\n" +
+	"\x10host_certificate\x18\f \x01(\fR\x0fhostCertificate\"C\n" +
 	"\x19control_plane_cert_or_key\x12\x12\n" +
 	"\x04name\x18\x01 \x01(\tR\x04name\x12\x12\n" +
 	"\x04data\x18\x02 \x01(\fR\x04data\"7\n" +
diff --git a/joinservice/joinproto/join.proto b/joinservice/joinproto/join.proto
index 89c40b8a0..eed1163a6 100644
--- a/joinservice/joinproto/join.proto
+++ b/joinservice/joinproto/join.proto
@@ -20,6 +20,10 @@ message IssueJoinTicketRequest {
   bytes certificate_request = 2;
   // is_control_plane indicates whether the node is a control-plane node.
   bool is_control_plane = 3;
+  // host_public_key is the public host key that should be signed.
+  bytes host_public_key = 4;
+  // host_certificate_principals are principals that should be added to the host certificate.
+  repeated string host_certificate_principals = 5;
 }
 
 message IssueJoinTicketResponse {
@@ -47,6 +51,8 @@ message IssueJoinTicketResponse {
   repeated components.Component kubernetes_components = 10;
   // authorized_ca_public_key is an ssh ca key that can be used to connect to a node in case of an emergency.
   bytes authorized_ca_public_key = 11;
+  // host_certificate is the certificate that can be used to verify a nodes host key.
+  bytes host_certificate = 12;
 }
 
 message control_plane_cert_or_key {