diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go
index 00622fe96..e8fb038b3 100644
--- a/build/gobind-pinecone/monolith.go
+++ b/build/gobind-pinecone/monolith.go
@@ -97,7 +97,7 @@ func (m *DendriteMonolith) Start() {
 	var sk ed25519.PrivateKey
 	var pk ed25519.PublicKey
 	yggfile := fmt.Sprintf("%s/dendrite-yggdrasil.conf", m.StorageDirectory)
-	if _, err := os.Stat(yggfile); !os.IsNotExist(err) {
+	if _, err := os.Stat(yggfile); err == nil {
 		yggconf, e := ioutil.ReadFile(yggfile)
 		if e != nil {
 			panic(err)
@@ -107,10 +107,12 @@ func (m *DendriteMonolith) Start() {
 			panic(err)
 		}
 		if mapconf["SigningPrivateKey"] != nil && mapconf["SigningPublicKey"] != nil {
-			if sk, err = hex.DecodeString(mapconf["SigningPrivateKey"].(string)); err != nil {
+			m.config.SigningPrivateKey = mapconf["SigningPrivateKey"].(string)
+			m.config.SigningPublicKey = mapconf["SigningPublicKey"].(string)
+			if sk, err = hex.DecodeString(m.config.SigningPrivateKey); err != nil {
 				panic(err)
 			}
-			if pk, err = hex.DecodeString(mapconf["SigningPublicKey"].(string)); err != nil {
+			if pk, err = hex.DecodeString(m.config.SigningPublicKey); err != nil {
 				panic(err)
 			}
 		} else {
@@ -157,7 +159,7 @@ func (m *DendriteMonolith) Start() {
 
 	cfg := &config.Dendrite{}
 	cfg.Defaults()
-	cfg.Global.ServerName = gomatrixserverlib.ServerName(m.config.SigningPublicKey)
+	cfg.Global.ServerName = gomatrixserverlib.ServerName(hex.EncodeToString(pk))
 	cfg.Global.PrivateKey = sk
 	cfg.Global.KeyID = gomatrixserverlib.KeyID(signing.KeyID)
 	cfg.Global.Kafka.UseNaffka = true
diff --git a/go.mod b/go.mod
index 69ae89a2d..6b7c291ef 100644
--- a/go.mod
+++ b/go.mod
@@ -47,6 +47,7 @@ require (
 	golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9
 	golang.org/x/mobile v0.0.0-20200801112145-973feb4309de // indirect
 	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
+	golang.org/x/sys v0.0.0-20201119102817-f84b799fce68
 	gopkg.in/h2non/bimg.v1 v1.1.4
 	gopkg.in/yaml.v2 v2.3.0
 )