diff --git a/bootstrapconfig/config.go b/bootstrapconfig/config.go
index 0d767e6..f8e331d 100644
--- a/bootstrapconfig/config.go
+++ b/bootstrapconfig/config.go
@@ -18,7 +18,20 @@ type Config struct {
 		Script string
 	}
 
-	LVM       []LvmVG
+	SSH struct {
+		Listen string
+		Keys   struct {
+			DSA     string
+			RSA     string
+			ECDSA   string
+			ED25519 string
+		}
+	}
+
+	LVM []LvmVG
+
+	Crypt []CryptDev
+
 	Bootstrap Bootstrap
 }
 
@@ -42,7 +55,6 @@ type LvmVG struct {
 
 	LVs []struct {
 		Name    string
-		Crypt   string
 		FS      string
 		Raid    *RaidConfig
 		Size    string
@@ -50,6 +62,12 @@ type LvmVG struct {
 	}
 }
 
+type CryptDev struct {
+	Dev   string
+	Match string
+	Name  string
+}
+
 type RaidConfig struct {
 	Mirrors int
 	Stripes int