diff --git a/go-workspace/src/bootstrap/bootstrap.go b/go-workspace/src/bootstrap/bootstrap.go
index 8f49696..f8b0034 100644
--- a/go-workspace/src/bootstrap/bootstrap.go
+++ b/go-workspace/src/bootstrap/bootstrap.go
@@ -57,7 +57,7 @@ func FromFS(bootstrapFS fs.FS) (Bootstrap, error) {
 		bootstrapFS,
 		garageGlobalBucketKeyYmlPath,
 	); err != nil {
-		return Bootstrap{}, fmt.Errorf("loading %q from fs: %w", b.GarageGlobalBucketS3APICredentials, err)
+		return Bootstrap{}, fmt.Errorf("loading %q from fs: %w", garageGlobalBucketKeyYmlPath, err)
 	}
 
 	filesToLoadAsString := []struct {
diff --git a/go-workspace/src/bootstrap/garage.go b/go-workspace/src/bootstrap/garage.go
index 775a6ae..cdce6bd 100644
--- a/go-workspace/src/bootstrap/garage.go
+++ b/go-workspace/src/bootstrap/garage.go
@@ -6,7 +6,7 @@ import (
 
 // Paths within the bootstrap FS related to garage.
 const (
-	garageGlobalBucketKeyYmlPath = "garage/global-bucket-key.yml"
+	garageGlobalBucketKeyYmlPath = "garage/cryptic-net-global-bucket-key.yml"
 	garageRPCSecretPath          = "garage/rpc-secret.txt"
 )
 
diff --git a/go-workspace/src/garage.go b/go-workspace/src/garage.go
index 779b800..df4818a 100644
--- a/go-workspace/src/garage.go
+++ b/go-workspace/src/garage.go
@@ -10,6 +10,8 @@ import (
 // will otherwise return a random endpoint.
 func (env *Env) ChooseGaragePeer() garage.Peer {
 
+	// TODO this only works well within the daemon process, otherwise daemon.yml
+	// isn't available.
 	if allocs := env.ThisDaemon().Storage.Allocations; len(allocs) > 0 {
 
 		return garage.Peer{