diff --git a/internal/cmd/all/list_test.go b/internal/cmd/all/list_test.go
index a45962d34..f3562db7d 100644
--- a/internal/cmd/all/list_test.go
+++ b/internal/cmd/all/list_test.go
@@ -173,7 +173,7 @@ func TestListAll(t *testing.T) {
 			},
 		}, nil)
 
-	out, err := fx.Run(cmd, []string{})
+	out, _, err := fx.Run(cmd, []string{})
 
 	expOut := `SERVERS
 ---
@@ -287,7 +287,7 @@ func TestListAllPaidJSON(t *testing.T) {
 		AllWithOpts(gomock.Any(), hcloud.VolumeListOpts{}).
 		Return([]*hcloud.Volume{}, nil)
 
-	out, err := fx.Run(cmd, []string{"--paid", "-o=json"})
+	out, _, err := fx.Run(cmd, []string{"--paid", "-o=json"})
 
 	expOut := "{\"floating_ips\":[],\"images\":[{\"id\":114690387,\"status\":\"available\",\"type\":\"system\"," +
 		"\"name\":\"debian-12\",\"description\":\"Debian 12\",\"image_size\":0,\"disk_size\":5,\"created\":" +
diff --git a/internal/cmd/certificate/create_test.go b/internal/cmd/certificate/create_test.go
index f5bc8dd27..e5114d902 100644
--- a/internal/cmd/certificate/create_test.go
+++ b/internal/cmd/certificate/create_test.go
@@ -40,7 +40,7 @@ func TestCreateManaged(t *testing.T) {
 	fx.ActionWaiter.EXPECT().
 		ActionProgress(gomock.Any(), &hcloud.Action{ID: 321})
 
-	out, err := fx.Run(cmd, []string{"--name", "test", "--type", "managed", "--domain", "example.com"})
+	out, _, err := fx.Run(cmd, []string{"--name", "test", "--type", "managed", "--domain", "example.com"})
 
 	expOut := "Certificate 123 created\n"
 
@@ -72,7 +72,7 @@ func TestCreateUploaded(t *testing.T) {
 			Type: hcloud.CertificateTypeUploaded,
 		}, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"--name", "test", "--key-file", "testdata/key.pem", "--cert-file", "testdata/cert.pem"})
+	out, _, err := fx.Run(cmd, []string{"--name", "test", "--key-file", "testdata/key.pem", "--cert-file", "testdata/cert.pem"})
 
 	expOut := "Certificate 123 created\n"
 
diff --git a/internal/cmd/certificate/delete_test.go b/internal/cmd/certificate/delete_test.go
index babac312d..8cc168a8a 100644
--- a/internal/cmd/certificate/delete_test.go
+++ b/internal/cmd/certificate/delete_test.go
@@ -34,7 +34,7 @@ func TestDelete(t *testing.T) {
 		Delete(gomock.Any(), cert).
 		Return(nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := "certificate test deleted\n"
 
diff --git a/internal/cmd/certificate/describe_test.go b/internal/cmd/certificate/describe_test.go
index 96ca809d9..b01a29048 100644
--- a/internal/cmd/certificate/describe_test.go
+++ b/internal/cmd/certificate/describe_test.go
@@ -57,7 +57,7 @@ func TestDescribe(t *testing.T) {
 		LoadBalancerName(int64(123)).
 		Return("test")
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := fmt.Sprintf(`ID:			123
 Name:			test
diff --git a/internal/cmd/certificate/labels_test.go b/internal/cmd/certificate/labels_test.go
index 095d08885..78f25e263 100644
--- a/internal/cmd/certificate/labels_test.go
+++ b/internal/cmd/certificate/labels_test.go
@@ -31,7 +31,7 @@ func TestLabelAdd(t *testing.T) {
 			},
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key=value"})
+	out, _, err := fx.Run(cmd, []string{"123", "key=value"})
 
 	expOut := "Label key added to certificate 123\n"
 
@@ -62,7 +62,7 @@ func TestLabelRemove(t *testing.T) {
 			Labels: make(map[string]string),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key"})
+	out, _, err := fx.Run(cmd, []string{"123", "key"})
 
 	expOut := "Label key removed from certificate 123\n"
 
diff --git a/internal/cmd/certificate/list_test.go b/internal/cmd/certificate/list_test.go
index f87aa0419..b98678691 100644
--- a/internal/cmd/certificate/list_test.go
+++ b/internal/cmd/certificate/list_test.go
@@ -40,7 +40,7 @@ func TestList(t *testing.T) {
 			},
 		}, nil)
 
-	out, err := fx.Run(cmd, []string{})
+	out, _, err := fx.Run(cmd, []string{})
 
 	expOut := `ID    NAME   TYPE      DOMAIN NAMES   NOT VALID AFTER                AGE
 123   test   managed   example.com    Wed Aug 20 12:00:00 UTC 2036   20m
diff --git a/internal/cmd/certificate/update_test.go b/internal/cmd/certificate/update_test.go
index 597e6de97..a5e5f79ee 100644
--- a/internal/cmd/certificate/update_test.go
+++ b/internal/cmd/certificate/update_test.go
@@ -29,7 +29,7 @@ func TestUpdateName(t *testing.T) {
 			Name: "new-name",
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
+	out, _, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
 
 	expOut := "certificate 123 updated\n"
 
diff --git a/internal/cmd/datacenter/describe_test.go b/internal/cmd/datacenter/describe_test.go
index 67c51725f..ac60a9160 100644
--- a/internal/cmd/datacenter/describe_test.go
+++ b/internal/cmd/datacenter/describe_test.go
@@ -30,7 +30,7 @@ func TestDescribe(t *testing.T) {
 			Description: "Falkenstein 1 virtual DC 14",
 		}, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := `ID:		4
 Name:		fsn1-dc14
diff --git a/internal/cmd/datacenter/list_test.go b/internal/cmd/datacenter/list_test.go
index 009d8aa20..d19b3ab12 100644
--- a/internal/cmd/datacenter/list_test.go
+++ b/internal/cmd/datacenter/list_test.go
@@ -38,7 +38,7 @@ func TestList(t *testing.T) {
 			},
 		}, nil)
 
-	out, err := fx.Run(cmd, []string{})
+	out, _, err := fx.Run(cmd, []string{})
 
 	expOut := `ID   NAME        DESCRIPTION                   LOCATION
 4    fsn1-dc14   Falkenstein 1 virtual DC 14   fsn1
diff --git a/internal/cmd/firewall/create_test.go b/internal/cmd/firewall/create_test.go
index 913c4625d..309c79ce2 100644
--- a/internal/cmd/firewall/create_test.go
+++ b/internal/cmd/firewall/create_test.go
@@ -37,7 +37,7 @@ func TestCreate(t *testing.T) {
 	fx.ActionWaiter.EXPECT().
 		WaitForActions(gomock.Any(), []*hcloud.Action{{ID: 321}})
 
-	out, err := fx.Run(cmd, []string{"--name", "test"})
+	out, _, err := fx.Run(cmd, []string{"--name", "test"})
 
 	expOut := "Firewall 123 created\n"
 
diff --git a/internal/cmd/firewall/delete_test.go b/internal/cmd/firewall/delete_test.go
index f43157c7d..5bf36320b 100644
--- a/internal/cmd/firewall/delete_test.go
+++ b/internal/cmd/firewall/delete_test.go
@@ -34,7 +34,7 @@ func TestDelete(t *testing.T) {
 		Delete(gomock.Any(), firewall).
 		Return(nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := "firewall test deleted\n"
 
diff --git a/internal/cmd/firewall/describe_test.go b/internal/cmd/firewall/describe_test.go
index 5503497df..4cda263d9 100644
--- a/internal/cmd/firewall/describe_test.go
+++ b/internal/cmd/firewall/describe_test.go
@@ -59,7 +59,7 @@ func TestDescribe(t *testing.T) {
 		ServerName(int64(321)).
 		Return("myServer")
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := fmt.Sprintf(`ID:		123
 Name:		test
diff --git a/internal/cmd/firewall/labels_test.go b/internal/cmd/firewall/labels_test.go
index 19a46accc..fc9525274 100644
--- a/internal/cmd/firewall/labels_test.go
+++ b/internal/cmd/firewall/labels_test.go
@@ -31,7 +31,7 @@ func TestLabelAdd(t *testing.T) {
 			},
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key=value"})
+	out, _, err := fx.Run(cmd, []string{"123", "key=value"})
 
 	expOut := "Label key added to firewall 123\n"
 
@@ -62,7 +62,7 @@ func TestLabelRemove(t *testing.T) {
 			Labels: make(map[string]string),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key"})
+	out, _, err := fx.Run(cmd, []string{"123", "key"})
 
 	expOut := "Label key removed from firewall 123\n"
 
diff --git a/internal/cmd/firewall/list_test.go b/internal/cmd/firewall/list_test.go
index bd8150088..a808b6e51 100644
--- a/internal/cmd/firewall/list_test.go
+++ b/internal/cmd/firewall/list_test.go
@@ -39,7 +39,7 @@ func TestList(t *testing.T) {
 			},
 		}, nil)
 
-	out, err := fx.Run(cmd, []string{})
+	out, _, err := fx.Run(cmd, []string{})
 
 	expOut := `ID    NAME   RULES COUNT   APPLIED TO COUNT
 123   test   5 Rules       2 Servers | 0 Label Selectors
diff --git a/internal/cmd/firewall/update_test.go b/internal/cmd/firewall/update_test.go
index b07b9a511..77013a171 100644
--- a/internal/cmd/firewall/update_test.go
+++ b/internal/cmd/firewall/update_test.go
@@ -29,7 +29,7 @@ func TestUpdateName(t *testing.T) {
 			Name: "new-name",
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
+	out, _, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
 
 	expOut := "Firewall 123 updated\n"
 
diff --git a/internal/cmd/floatingip/create_test.go b/internal/cmd/floatingip/create_test.go
index 5852829be..aa7a84e2b 100644
--- a/internal/cmd/floatingip/create_test.go
+++ b/internal/cmd/floatingip/create_test.go
@@ -41,7 +41,7 @@ func TestCreate(t *testing.T) {
 			Action: nil,
 		}, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"--name", "myFloatingIP", "--type", "ipv4", "--home-location", "fsn1"})
+	out, _, err := fx.Run(cmd, []string{"--name", "myFloatingIP", "--type", "ipv4", "--home-location", "fsn1"})
 
 	expOut := `Floating IP 123 created
 IPv4: 192.168.2.1
@@ -92,7 +92,7 @@ func TestCreateProtection(t *testing.T) {
 		Return(&hcloud.Action{ID: 333}, nil, nil)
 	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), &hcloud.Action{ID: 333}).Return(nil)
 
-	out, err := fx.Run(cmd, []string{"--name", "myFloatingIP", "--type", "ipv4", "--home-location", "fsn1", "--enable-protection", "delete"})
+	out, _, err := fx.Run(cmd, []string{"--name", "myFloatingIP", "--type", "ipv4", "--home-location", "fsn1", "--enable-protection", "delete"})
 
 	expOut := `Floating IP 123 created
 Resource protection enabled for floating IP 123
diff --git a/internal/cmd/floatingip/delete_test.go b/internal/cmd/floatingip/delete_test.go
index e859a72cf..12291c20b 100644
--- a/internal/cmd/floatingip/delete_test.go
+++ b/internal/cmd/floatingip/delete_test.go
@@ -34,7 +34,7 @@ func TestDelete(t *testing.T) {
 		Delete(gomock.Any(), floatingIP).
 		Return(nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := "Floating IP test deleted\n"
 
diff --git a/internal/cmd/floatingip/describe_test.go b/internal/cmd/floatingip/describe_test.go
index 7c1dc50a7..9f6e80d89 100644
--- a/internal/cmd/floatingip/describe_test.go
+++ b/internal/cmd/floatingip/describe_test.go
@@ -48,7 +48,7 @@ func TestDescribe(t *testing.T) {
 		ServerName(int64(321)).
 		Return("myServer")
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := fmt.Sprintf(`ID:		123
 Type:		ipv4
diff --git a/internal/cmd/floatingip/labels_test.go b/internal/cmd/floatingip/labels_test.go
index 37fd0ab35..2c82af5c0 100644
--- a/internal/cmd/floatingip/labels_test.go
+++ b/internal/cmd/floatingip/labels_test.go
@@ -31,7 +31,7 @@ func TestLabelAdd(t *testing.T) {
 			},
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key=value"})
+	out, _, err := fx.Run(cmd, []string{"123", "key=value"})
 
 	expOut := "Label key added to Floating IP 123\n"
 
@@ -62,7 +62,7 @@ func TestLabelRemove(t *testing.T) {
 			Labels: make(map[string]string),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key"})
+	out, _, err := fx.Run(cmd, []string{"123", "key"})
 
 	expOut := "Label key removed from Floating IP 123\n"
 
diff --git a/internal/cmd/floatingip/list_test.go b/internal/cmd/floatingip/list_test.go
index 196524150..cc78513f6 100644
--- a/internal/cmd/floatingip/list_test.go
+++ b/internal/cmd/floatingip/list_test.go
@@ -41,7 +41,7 @@ func TestList(t *testing.T) {
 			},
 		}, nil)
 
-	out, err := fx.Run(cmd, []string{})
+	out, _, err := fx.Run(cmd, []string{})
 
 	expOut := `ID    TYPE   NAME   DESCRIPTION   IP            HOME   SERVER   DNS   AGE
 123   ipv4   test   -             192.168.2.1   fsn1   -        -     10m
diff --git a/internal/cmd/floatingip/update_test.go b/internal/cmd/floatingip/update_test.go
index 73e619fb5..df5a480fa 100644
--- a/internal/cmd/floatingip/update_test.go
+++ b/internal/cmd/floatingip/update_test.go
@@ -29,7 +29,7 @@ func TestUpdateName(t *testing.T) {
 			Name: "new-name",
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
+	out, _, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
 
 	expOut := "Floating IP 123 updated\n"
 
@@ -55,7 +55,7 @@ func TestUpdateDescription(t *testing.T) {
 			Description: "new-description",
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--description", "new-description"})
+	out, _, err := fx.Run(cmd, []string{"123", "--description", "new-description"})
 
 	expOut := "Floating IP 123 updated\n"
 
diff --git a/internal/cmd/image/delete_test.go b/internal/cmd/image/delete_test.go
index 00adbaf50..533d9dc83 100644
--- a/internal/cmd/image/delete_test.go
+++ b/internal/cmd/image/delete_test.go
@@ -34,7 +34,7 @@ func TestDelete(t *testing.T) {
 		Delete(gomock.Any(), image).
 		Return(nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := "image test deleted\n"
 
diff --git a/internal/cmd/image/describe_test.go b/internal/cmd/image/describe_test.go
index 6595358fc..f9586f64d 100644
--- a/internal/cmd/image/describe_test.go
+++ b/internal/cmd/image/describe_test.go
@@ -46,7 +46,7 @@ func TestDescribe(t *testing.T) {
 		GetForArchitecture(gomock.Any(), "test", hcloud.ArchitectureX86).
 		Return(img, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := fmt.Sprintf(`ID:		123
 Type:		system
diff --git a/internal/cmd/image/labels_test.go b/internal/cmd/image/labels_test.go
index 70fa50130..e1ab7091d 100644
--- a/internal/cmd/image/labels_test.go
+++ b/internal/cmd/image/labels_test.go
@@ -31,7 +31,7 @@ func TestLabelAdd(t *testing.T) {
 			},
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key=value"})
+	out, _, err := fx.Run(cmd, []string{"123", "key=value"})
 
 	expOut := "Label key added to image 123\n"
 
@@ -62,7 +62,7 @@ func TestLabelRemove(t *testing.T) {
 			Labels: make(map[string]string),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key"})
+	out, _, err := fx.Run(cmd, []string{"123", "key"})
 
 	expOut := "Label key removed from image 123\n"
 
diff --git a/internal/cmd/image/list_test.go b/internal/cmd/image/list_test.go
index d48582b31..a59381757 100644
--- a/internal/cmd/image/list_test.go
+++ b/internal/cmd/image/list_test.go
@@ -42,7 +42,7 @@ func TestList(t *testing.T) {
 			},
 		}, nil)
 
-	out, err := fx.Run(cmd, []string{})
+	out, _, err := fx.Run(cmd, []string{})
 
 	expOut := `ID    TYPE     NAME   DESCRIPTION   ARCHITECTURE   IMAGE SIZE   DISK SIZE   CREATED                        DEPRECATED
 123   system   test   -             x86            20.00 GB     15 GB       Wed Aug 20 12:00:00 UTC 2036   -
diff --git a/internal/cmd/image/update_test.go b/internal/cmd/image/update_test.go
index eb4b0f80e..8885888b0 100644
--- a/internal/cmd/image/update_test.go
+++ b/internal/cmd/image/update_test.go
@@ -29,7 +29,7 @@ func TestUpdateDescription(t *testing.T) {
 			Description: hcloud.Ptr("new-description"),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--description", "new-description"})
+	out, _, err := fx.Run(cmd, []string{"123", "--description", "new-description"})
 
 	expOut := "Image 123 updated\n"
 
@@ -56,7 +56,7 @@ func TestUpdateType(t *testing.T) {
 			Type:        hcloud.ImageTypeSnapshot,
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--type", "snapshot"})
+	out, _, err := fx.Run(cmd, []string{"123", "--type", "snapshot"})
 
 	expOut := "Image 123 updated\n"
 
diff --git a/internal/cmd/iso/describe_test.go b/internal/cmd/iso/describe_test.go
index 218168941..348576ca2 100644
--- a/internal/cmd/iso/describe_test.go
+++ b/internal/cmd/iso/describe_test.go
@@ -31,7 +31,7 @@ func TestDescribe(t *testing.T) {
 			Architecture: hcloud.Ptr(hcloud.ArchitectureX86),
 		}, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := `ID:		123
 Name:		test
diff --git a/internal/cmd/iso/list_test.go b/internal/cmd/iso/list_test.go
index 57c68f4f5..69fd43f52 100644
--- a/internal/cmd/iso/list_test.go
+++ b/internal/cmd/iso/list_test.go
@@ -39,7 +39,7 @@ func TestList(t *testing.T) {
 			},
 		}, nil)
 
-	out, err := fx.Run(cmd, []string{})
+	out, _, err := fx.Run(cmd, []string{})
 
 	expOut := `ID    NAME   DESCRIPTION   TYPE     ARCHITECTURE
 123   test   Test ISO      public   x86
diff --git a/internal/cmd/loadbalancer/create_test.go b/internal/cmd/loadbalancer/create_test.go
index 60753b5af..393e301ed 100644
--- a/internal/cmd/loadbalancer/create_test.go
+++ b/internal/cmd/loadbalancer/create_test.go
@@ -49,7 +49,7 @@ func TestCreate(t *testing.T) {
 			},
 		}, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"--name", "myLoadBalancer", "--type", "lb11", "--location", "fsn1"})
+	out, _, err := fx.Run(cmd, []string{"--name", "myLoadBalancer", "--type", "lb11", "--location", "fsn1"})
 
 	expOut := `Load Balancer 123 created
 IPv4: 192.168.2.1
@@ -105,7 +105,7 @@ func TestCreateProtection(t *testing.T) {
 		Return(&hcloud.Action{ID: 333}, nil, nil)
 	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), &hcloud.Action{ID: 333}).Return(nil)
 
-	out, err := fx.Run(cmd, []string{"--name", "myLoadBalancer", "--type", "lb11", "--location", "fsn1", "--enable-protection", "delete"})
+	out, _, err := fx.Run(cmd, []string{"--name", "myLoadBalancer", "--type", "lb11", "--location", "fsn1", "--enable-protection", "delete"})
 
 	expOut := `Load Balancer 123 created
 Resource protection enabled for Load Balancer 123
diff --git a/internal/cmd/loadbalancer/delete_test.go b/internal/cmd/loadbalancer/delete_test.go
index a81c4a7fc..b63c9f91c 100644
--- a/internal/cmd/loadbalancer/delete_test.go
+++ b/internal/cmd/loadbalancer/delete_test.go
@@ -34,7 +34,7 @@ func TestDelete(t *testing.T) {
 		Delete(gomock.Any(), loadBalancer).
 		Return(nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := "Load Balancer test deleted\n"
 
diff --git a/internal/cmd/loadbalancer/describe_test.go b/internal/cmd/loadbalancer/describe_test.go
index 0bf6fae57..8e75aabb4 100644
--- a/internal/cmd/loadbalancer/describe_test.go
+++ b/internal/cmd/loadbalancer/describe_test.go
@@ -62,7 +62,7 @@ func TestDescribe(t *testing.T) {
 		Get(gomock.Any(), "test").
 		Return(lb, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := fmt.Sprintf(`ID:				123
 Name:				test
diff --git a/internal/cmd/loadbalancer/labels_test.go b/internal/cmd/loadbalancer/labels_test.go
index 920c2bc8c..d38b3990d 100644
--- a/internal/cmd/loadbalancer/labels_test.go
+++ b/internal/cmd/loadbalancer/labels_test.go
@@ -31,7 +31,7 @@ func TestLabelAdd(t *testing.T) {
 			},
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key=value"})
+	out, _, err := fx.Run(cmd, []string{"123", "key=value"})
 
 	expOut := "Label key added to Load Balancer 123\n"
 
@@ -62,7 +62,7 @@ func TestLabelRemove(t *testing.T) {
 			Labels: make(map[string]string),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key"})
+	out, _, err := fx.Run(cmd, []string{"123", "key"})
 
 	expOut := "Label key removed from Load Balancer 123\n"
 
diff --git a/internal/cmd/loadbalancer/update_test.go b/internal/cmd/loadbalancer/update_test.go
index adafe223a..12a2bcf80 100644
--- a/internal/cmd/loadbalancer/update_test.go
+++ b/internal/cmd/loadbalancer/update_test.go
@@ -29,7 +29,7 @@ func TestUpdateName(t *testing.T) {
 			Name: "new-name",
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
+	out, _, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
 
 	expOut := "Load Balancer 123 updated\n"
 
diff --git a/internal/cmd/loadbalancertype/describe_test.go b/internal/cmd/loadbalancertype/describe_test.go
index 8d09181be..6b150480e 100644
--- a/internal/cmd/loadbalancertype/describe_test.go
+++ b/internal/cmd/loadbalancertype/describe_test.go
@@ -33,7 +33,7 @@ func TestDescribe(t *testing.T) {
 			MaxAssignedCertificates: 10,
 		}, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"lb11"})
+	out, _, err := fx.Run(cmd, []string{"lb11"})
 
 	expOut := `ID:				123
 Name:				lb11
diff --git a/internal/cmd/loadbalancertype/list_test.go b/internal/cmd/loadbalancertype/list_test.go
index 824a305c9..892b1b6e3 100644
--- a/internal/cmd/loadbalancertype/list_test.go
+++ b/internal/cmd/loadbalancertype/list_test.go
@@ -39,7 +39,7 @@ func TestList(t *testing.T) {
 			},
 		}, nil)
 
-	out, err := fx.Run(cmd, []string{})
+	out, _, err := fx.Run(cmd, []string{})
 
 	expOut := `ID    NAME   DESCRIPTION   MAX SERVICES   MAX CONNECTIONS   MAX TARGETS
 123   test   -             12             100               5
diff --git a/internal/cmd/location/describe_test.go b/internal/cmd/location/describe_test.go
index 2ba33b624..28f3c4dc5 100644
--- a/internal/cmd/location/describe_test.go
+++ b/internal/cmd/location/describe_test.go
@@ -35,7 +35,7 @@ func TestDescribe(t *testing.T) {
 			Longitude:   24.938379,
 		}, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"hel1"})
+	out, _, err := fx.Run(cmd, []string{"hel1"})
 
 	expOut := `ID:		3
 Name:		hel1
diff --git a/internal/cmd/location/list_test.go b/internal/cmd/location/list_test.go
index 73e989157..bbc01a7ad 100644
--- a/internal/cmd/location/list_test.go
+++ b/internal/cmd/location/list_test.go
@@ -39,7 +39,7 @@ func TestList(t *testing.T) {
 			},
 		}, nil)
 
-	out, err := fx.Run(cmd, []string{})
+	out, _, err := fx.Run(cmd, []string{})
 
 	expOut := `ID   NAME   DESCRIPTION   NETWORK ZONE   COUNTRY   CITY
 1    fsn1   -             eu-central     DE        Falkenstein
diff --git a/internal/cmd/network/create_test.go b/internal/cmd/network/create_test.go
index ebe9ee787..41ed21651 100644
--- a/internal/cmd/network/create_test.go
+++ b/internal/cmd/network/create_test.go
@@ -36,7 +36,7 @@ func TestCreate(t *testing.T) {
 			IPRange: ipRange,
 		}, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"--name", "myNetwork", "--ip-range", "10.0.0.0/24"})
+	out, _, err := fx.Run(cmd, []string{"--name", "myNetwork", "--ip-range", "10.0.0.0/24"})
 
 	expOut := "Network 123 created\n"
 
@@ -76,7 +76,7 @@ func TestCreateProtection(t *testing.T) {
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), &hcloud.Action{ID: 123}).Return(nil)
 
-	out, err := fx.Run(cmd, []string{"--name", "myNetwork", "--ip-range", "10.0.0.0/24", "--enable-protection", "delete"})
+	out, _, err := fx.Run(cmd, []string{"--name", "myNetwork", "--ip-range", "10.0.0.0/24", "--enable-protection", "delete"})
 
 	expOut := `Network 123 created
 Resource protection enabled for network 123
diff --git a/internal/cmd/network/delete_test.go b/internal/cmd/network/delete_test.go
index 54a6630fb..55c0892da 100644
--- a/internal/cmd/network/delete_test.go
+++ b/internal/cmd/network/delete_test.go
@@ -34,7 +34,7 @@ func TestDelete(t *testing.T) {
 		Delete(gomock.Any(), network).
 		Return(nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := "Network test deleted\n"
 
diff --git a/internal/cmd/network/describe_test.go b/internal/cmd/network/describe_test.go
index 024e7d6b0..3169c260c 100644
--- a/internal/cmd/network/describe_test.go
+++ b/internal/cmd/network/describe_test.go
@@ -41,7 +41,7 @@ func TestDescribe(t *testing.T) {
 		Get(gomock.Any(), "test").
 		Return(network, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := fmt.Sprintf(`ID:		123
 Name:		test
diff --git a/internal/cmd/network/labels_test.go b/internal/cmd/network/labels_test.go
index 473e755ec..c714e4118 100644
--- a/internal/cmd/network/labels_test.go
+++ b/internal/cmd/network/labels_test.go
@@ -31,7 +31,7 @@ func TestLabelAdd(t *testing.T) {
 			},
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key=value"})
+	out, _, err := fx.Run(cmd, []string{"123", "key=value"})
 
 	expOut := "Label key added to Network 123\n"
 
@@ -62,7 +62,7 @@ func TestLabelRemove(t *testing.T) {
 			Labels: make(map[string]string),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key"})
+	out, _, err := fx.Run(cmd, []string{"123", "key"})
 
 	expOut := "Label key removed from Network 123\n"
 
diff --git a/internal/cmd/network/list_test.go b/internal/cmd/network/list_test.go
index 83ed6f55d..64426a0ce 100644
--- a/internal/cmd/network/list_test.go
+++ b/internal/cmd/network/list_test.go
@@ -43,7 +43,7 @@ func TestList(t *testing.T) {
 		},
 			nil)
 
-	out, err := fx.Run(cmd, []string{"--selector", "foo=bar"})
+	out, _, err := fx.Run(cmd, []string{"--selector", "foo=bar"})
 
 	expOut := `ID    NAME       IP RANGE       SERVERS    AGE
 123   test-net   192.0.2.1/24   1 server   10s
diff --git a/internal/cmd/network/update_test.go b/internal/cmd/network/update_test.go
index f6d85a372..f1b3fb310 100644
--- a/internal/cmd/network/update_test.go
+++ b/internal/cmd/network/update_test.go
@@ -29,7 +29,7 @@ func TestUpdateName(t *testing.T) {
 			Name: "new-name",
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
+	out, _, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
 
 	expOut := "Network 123 updated\n"
 
diff --git a/internal/cmd/placementgroup/create_test.go b/internal/cmd/placementgroup/create_test.go
index 4b28d8002..a68f0fa3c 100644
--- a/internal/cmd/placementgroup/create_test.go
+++ b/internal/cmd/placementgroup/create_test.go
@@ -45,7 +45,7 @@ func TestCreate(t *testing.T) {
 	fx.ActionWaiter.EXPECT().
 		ActionProgress(gomock.Any(), &hcloud.Action{ID: 321})
 
-	out, err := fx.Run(cmd, []string{"--name", placementGroup.Name, "--type", string(placementGroup.Type)})
+	out, _, err := fx.Run(cmd, []string{"--name", placementGroup.Name, "--type", string(placementGroup.Type)})
 
 	expOut := `Placement group 897 created
 `
diff --git a/internal/cmd/placementgroup/delete_test.go b/internal/cmd/placementgroup/delete_test.go
index a1835cf46..db493e775 100644
--- a/internal/cmd/placementgroup/delete_test.go
+++ b/internal/cmd/placementgroup/delete_test.go
@@ -39,7 +39,7 @@ func TestDelete(t *testing.T) {
 	fx.Client.PlacementGroupClient.EXPECT().
 		Delete(gomock.Any(), &placementGroup)
 
-	_, err := fx.Run(cmd, []string{placementGroup.Name})
+	_, _, err := fx.Run(cmd, []string{placementGroup.Name})
 
 	assert.NoError(t, err)
 }
diff --git a/internal/cmd/placementgroup/describe_test.go b/internal/cmd/placementgroup/describe_test.go
index e82078b3c..816b9a8a5 100644
--- a/internal/cmd/placementgroup/describe_test.go
+++ b/internal/cmd/placementgroup/describe_test.go
@@ -47,7 +47,7 @@ func TestDescribe(t *testing.T) {
 		ServerName(int64(4712)).
 		Return("server2")
 
-	out, err := fx.Run(cmd, []string{placementGroup.Name})
+	out, _, err := fx.Run(cmd, []string{placementGroup.Name})
 
 	expOut := fmt.Sprintf(`ID:		897
 Name:		my Placement Group
diff --git a/internal/cmd/placementgroup/labels_test.go b/internal/cmd/placementgroup/labels_test.go
index e60452a21..076605d9b 100644
--- a/internal/cmd/placementgroup/labels_test.go
+++ b/internal/cmd/placementgroup/labels_test.go
@@ -31,7 +31,7 @@ func TestLabelAdd(t *testing.T) {
 			},
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key=value"})
+	out, _, err := fx.Run(cmd, []string{"123", "key=value"})
 
 	expOut := "Label key added to placement group 123\n"
 
@@ -62,7 +62,7 @@ func TestLabelRemove(t *testing.T) {
 			Labels: make(map[string]string),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key"})
+	out, _, err := fx.Run(cmd, []string{"123", "key"})
 
 	expOut := "Label key removed from placement group 123\n"
 
diff --git a/internal/cmd/placementgroup/list_test.go b/internal/cmd/placementgroup/list_test.go
index feaa33046..fa82ddada 100644
--- a/internal/cmd/placementgroup/list_test.go
+++ b/internal/cmd/placementgroup/list_test.go
@@ -45,7 +45,7 @@ func TestList(t *testing.T) {
 			},
 		}, nil)
 
-	out, err := fx.Run(cmd, []string{"--selector", "foo=bar"})
+	out, _, err := fx.Run(cmd, []string{"--selector", "foo=bar"})
 
 	expOut := `ID    NAME                 SERVERS     TYPE     AGE
 897   my Placement Group   2 servers   spread   10s
diff --git a/internal/cmd/placementgroup/update_test.go b/internal/cmd/placementgroup/update_test.go
index 99de53f87..b050f2c32 100644
--- a/internal/cmd/placementgroup/update_test.go
+++ b/internal/cmd/placementgroup/update_test.go
@@ -29,7 +29,7 @@ func TestUpdateName(t *testing.T) {
 			Name: "new-name",
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
+	out, _, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
 
 	expOut := "placement group 123 updated\n"
 
diff --git a/internal/cmd/primaryip/assign_test.go b/internal/cmd/primaryip/assign_test.go
index 995cd09a4..be1f2977f 100644
--- a/internal/cmd/primaryip/assign_test.go
+++ b/internal/cmd/primaryip/assign_test.go
@@ -56,7 +56,7 @@ func TestAssign(t *testing.T) {
 
 	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), action).Return(nil)
 
-	out, err := fx.Run(cmd, []string{"13", "--server", "15"})
+	out, _, err := fx.Run(cmd, []string{"13", "--server", "15"})
 
 	expOut := "Primary IP 13 assigned to server 15\n"
 
diff --git a/internal/cmd/primaryip/changedns_test.go b/internal/cmd/primaryip/changedns_test.go
index 506803353..2c673309a 100644
--- a/internal/cmd/primaryip/changedns_test.go
+++ b/internal/cmd/primaryip/changedns_test.go
@@ -45,7 +45,7 @@ func TestChangeDNS(t *testing.T) {
 
 	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), action).Return(nil)
 
-	out, err := fx.Run(cmd, []string{"--hostname=server.your-host.de", "--ip=192.168.0.1", "13"})
+	out, _, err := fx.Run(cmd, []string{"--hostname=server.your-host.de", "--ip=192.168.0.1", "13"})
 
 	expOut := "Primary IP 13 DNS pointer: server.your-host.de associated to 192.168.0.1\n"
 
diff --git a/internal/cmd/primaryip/create_test.go b/internal/cmd/primaryip/create_test.go
index c6c2df51e..a433f8bc7 100644
--- a/internal/cmd/primaryip/create_test.go
+++ b/internal/cmd/primaryip/create_test.go
@@ -44,7 +44,7 @@ func TestCreate(t *testing.T) {
 	fx.ActionWaiter.EXPECT().
 		ActionProgress(gomock.Any(), &hcloud.Action{ID: 321})
 
-	out, err := fx.Run(cmd, []string{"--name=my-ip", "--type=ipv4", "--datacenter=fsn1-dc14"})
+	out, _, err := fx.Run(cmd, []string{"--name=my-ip", "--type=ipv4", "--datacenter=fsn1-dc14"})
 
 	expOut := `Primary IP 1 created
 IPv4: 192.168.2.1
diff --git a/internal/cmd/primaryip/delete_test.go b/internal/cmd/primaryip/delete_test.go
index 1f35a576c..b948cb3aa 100644
--- a/internal/cmd/primaryip/delete_test.go
+++ b/internal/cmd/primaryip/delete_test.go
@@ -38,7 +38,7 @@ func TestDelete(t *testing.T) {
 			nil,
 		)
 
-	out, err := fx.Run(cmd, []string{"13"})
+	out, _, err := fx.Run(cmd, []string{"13"})
 
 	expOut := "Primary IP 13 deleted\n"
 
diff --git a/internal/cmd/primaryip/describe_test.go b/internal/cmd/primaryip/describe_test.go
index e10fe4667..5fe33784f 100644
--- a/internal/cmd/primaryip/describe_test.go
+++ b/internal/cmd/primaryip/describe_test.go
@@ -41,7 +41,7 @@ func TestDescribe(t *testing.T) {
 		Get(gomock.Any(), "10").
 		Return(primaryIP, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"10"})
+	out, _, err := fx.Run(cmd, []string{"10"})
 
 	expOut := fmt.Sprintf(`ID:		10
 Name:		test-net
diff --git a/internal/cmd/primaryip/disable_protection_test.go b/internal/cmd/primaryip/disable_protection_test.go
index 47b0f8767..8d65e08c1 100644
--- a/internal/cmd/primaryip/disable_protection_test.go
+++ b/internal/cmd/primaryip/disable_protection_test.go
@@ -44,7 +44,7 @@ func TestEnable(t *testing.T) {
 		)
 
 	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), action).Return(nil)
-	out, err := fx.Run(cmd, []string{"13"})
+	out, _, err := fx.Run(cmd, []string{"13"})
 
 	expOut := "Resource protection disabled for primary IP 13\n"
 
diff --git a/internal/cmd/primaryip/enable_protection_test.go b/internal/cmd/primaryip/enable_protection_test.go
index 13866408f..3138d4d2b 100644
--- a/internal/cmd/primaryip/enable_protection_test.go
+++ b/internal/cmd/primaryip/enable_protection_test.go
@@ -44,7 +44,7 @@ func TestEnableProtection(t *testing.T) {
 		)
 
 	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), action).Return(nil)
-	out, err := fx.Run(cmd, []string{"13"})
+	out, _, err := fx.Run(cmd, []string{"13"})
 
 	expOut := "Resource protection enabled for primary IP 13\n"
 
diff --git a/internal/cmd/primaryip/labels_test.go b/internal/cmd/primaryip/labels_test.go
index 9f258928d..4d72ac84d 100644
--- a/internal/cmd/primaryip/labels_test.go
+++ b/internal/cmd/primaryip/labels_test.go
@@ -31,7 +31,7 @@ func TestLabelAdd(t *testing.T) {
 			}),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key=value"})
+	out, _, err := fx.Run(cmd, []string{"123", "key=value"})
 
 	expOut := "Label key added to primary-ip 123\n"
 
@@ -62,7 +62,7 @@ func TestLabelRemove(t *testing.T) {
 			Labels: hcloud.Ptr(make(map[string]string)),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key"})
+	out, _, err := fx.Run(cmd, []string{"123", "key"})
 
 	expOut := "Label key removed from primary-ip 123\n"
 
diff --git a/internal/cmd/primaryip/list_test.go b/internal/cmd/primaryip/list_test.go
index d93f86559..a9e8cb895 100644
--- a/internal/cmd/primaryip/list_test.go
+++ b/internal/cmd/primaryip/list_test.go
@@ -43,7 +43,7 @@ func TestList(t *testing.T) {
 		},
 			nil)
 
-	out, err := fx.Run(cmd, []string{"--selector", "foo=bar"})
+	out, _, err := fx.Run(cmd, []string{"--selector", "foo=bar"})
 
 	expOut := `ID    TYPE   NAME       IP          ASSIGNEE   DNS   AUTO DELETE   AGE
 123   ipv4   test-net   127.0.0.1   -          -     yes           10s
diff --git a/internal/cmd/primaryip/unassign_test.go b/internal/cmd/primaryip/unassign_test.go
index f23b9aa72..945524fbe 100644
--- a/internal/cmd/primaryip/unassign_test.go
+++ b/internal/cmd/primaryip/unassign_test.go
@@ -41,7 +41,7 @@ func TestUnAssign(t *testing.T) {
 
 	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), action).Return(nil)
 
-	out, err := fx.Run(cmd, []string{"13"})
+	out, _, err := fx.Run(cmd, []string{"13"})
 
 	expOut := "Primary IP 13 was unassigned successfully\n"
 
diff --git a/internal/cmd/primaryip/update_test.go b/internal/cmd/primaryip/update_test.go
index e7dc948ad..b69510aa5 100644
--- a/internal/cmd/primaryip/update_test.go
+++ b/internal/cmd/primaryip/update_test.go
@@ -30,7 +30,7 @@ func TestUpdateName(t *testing.T) {
 			AutoDelete: nil,
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
+	out, _, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
 
 	expOut := "Primary IP 123 updated\n"
 
@@ -56,7 +56,7 @@ func TestUpdateAutoDelete(t *testing.T) {
 			AutoDelete: hcloud.Ptr(false),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--auto-delete=false"})
+	out, _, err := fx.Run(cmd, []string{"123", "--auto-delete=false"})
 
 	expOut := "Primary IP 123 updated\n"
 
diff --git a/internal/cmd/server/add_to_placement_group_test.go b/internal/cmd/server/add_to_placement_group_test.go
index b3c7b14a6..a1e2a443a 100644
--- a/internal/cmd/server/add_to_placement_group_test.go
+++ b/internal/cmd/server/add_to_placement_group_test.go
@@ -44,7 +44,7 @@ func TestAddToPlacementGroup(t *testing.T) {
 		AddToPlacementGroup(gomock.Any(), &server, &placementGroup)
 	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), nil)
 
-	out, err := fx.Run(cmd, []string{"-g", placementGroup.Name, server.Name})
+	out, _, err := fx.Run(cmd, []string{"-g", placementGroup.Name, server.Name})
 
 	expOut := `Server 42 added to placement group my Placement Group
 `
diff --git a/internal/cmd/server/create_test.go b/internal/cmd/server/create_test.go
index 5d84ecdaa..fd8967db6 100644
--- a/internal/cmd/server/create_test.go
+++ b/internal/cmd/server/create_test.go
@@ -63,7 +63,7 @@ func TestCreate(t *testing.T) {
 	fx.ActionWaiter.EXPECT().WaitForActions(gomock.Any(), []*hcloud.Action{{ID: 234}}).Return(nil)
 
 	args := []string{"--name", "cli-test", "--type", "cx11", "--image", "ubuntu-20.04"}
-	out, err := fx.Run(cmd, args)
+	out, _, err := fx.Run(cmd, args)
 
 	assert.NoError(t, err)
 	expOut := `Server 1234 created
@@ -145,7 +145,7 @@ func TestCreateProtectionBackup(t *testing.T) {
 	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), &hcloud.Action{ID: 42}).Return(nil)
 
 	args := []string{"--name", "cli-test", "--type", "cx11", "--image", "ubuntu-20.04", "--enable-protection", "rebuild,delete", "--enable-backup"}
-	out, err := fx.Run(cmd, args)
+	out, _, err := fx.Run(cmd, args)
 
 	assert.NoError(t, err)
 	expOut := `Server 1234 created
diff --git a/internal/cmd/server/delete_test.go b/internal/cmd/server/delete_test.go
index aecf953f3..45bbefe50 100644
--- a/internal/cmd/server/delete_test.go
+++ b/internal/cmd/server/delete_test.go
@@ -38,7 +38,7 @@ func TestDelete(t *testing.T) {
 	fx.ActionWaiter.EXPECT().
 		ActionProgress(gomock.Any(), &hcloud.Action{ID: 321})
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := "Server test deleted\n"
 
diff --git a/internal/cmd/server/describe_test.go b/internal/cmd/server/describe_test.go
index 49d6dc5f0..30495c035 100644
--- a/internal/cmd/server/describe_test.go
+++ b/internal/cmd/server/describe_test.go
@@ -78,7 +78,7 @@ func TestDescribe(t *testing.T) {
 		Get(gomock.Any(), "test").
 		Return(srv, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := fmt.Sprintf(`ID:		123
 Name:		test
diff --git a/internal/cmd/server/labels_test.go b/internal/cmd/server/labels_test.go
index 35340a2a0..ee8965fbb 100644
--- a/internal/cmd/server/labels_test.go
+++ b/internal/cmd/server/labels_test.go
@@ -31,7 +31,7 @@ func TestLabelAdd(t *testing.T) {
 			},
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key=value"})
+	out, _, err := fx.Run(cmd, []string{"123", "key=value"})
 
 	expOut := "Label key added to server 123\n"
 
@@ -62,7 +62,7 @@ func TestLabelRemove(t *testing.T) {
 			Labels: make(map[string]string),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key"})
+	out, _, err := fx.Run(cmd, []string{"123", "key"})
 
 	expOut := "Label key removed from server 123\n"
 
diff --git a/internal/cmd/server/list_test.go b/internal/cmd/server/list_test.go
index 700ce90b9..98f5d369c 100644
--- a/internal/cmd/server/list_test.go
+++ b/internal/cmd/server/list_test.go
@@ -45,7 +45,7 @@ func TestList(t *testing.T) {
 			},
 		}, nil)
 
-	out, err := fx.Run(cmd, []string{})
+	out, _, err := fx.Run(cmd, []string{})
 
 	expOut := `ID    NAME   STATUS    IPV4          IPV6   PRIVATE NET   DATACENTER   AGE
 123   test   running   192.168.2.1   -      -             fsn1-dc14    20s
diff --git a/internal/cmd/server/remove_from_placement_group_test.go b/internal/cmd/server/remove_from_placement_group_test.go
index c5ccdf5b7..3f38694b3 100644
--- a/internal/cmd/server/remove_from_placement_group_test.go
+++ b/internal/cmd/server/remove_from_placement_group_test.go
@@ -35,7 +35,7 @@ func TestRemoveFromPlacementGroup(t *testing.T) {
 		RemoveFromPlacementGroup(gomock.Any(), &server)
 	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), nil)
 
-	out, err := fx.Run(cmd, []string{server.Name})
+	out, _, err := fx.Run(cmd, []string{server.Name})
 
 	expOut := `Server 42 removed from placement group
 `
diff --git a/internal/cmd/server/shutdown_test.go b/internal/cmd/server/shutdown_test.go
index 3ffd47ddc..3d9a68682 100644
--- a/internal/cmd/server/shutdown_test.go
+++ b/internal/cmd/server/shutdown_test.go
@@ -39,7 +39,7 @@ func TestShutdown(t *testing.T) {
 		Shutdown(gomock.Any(), &server)
 	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), nil)
 
-	out, err := fx.Run(cmd, []string{server.Name})
+	out, _, err := fx.Run(cmd, []string{server.Name})
 
 	expOut := "Sent shutdown signal to server 42\n"
 
@@ -81,7 +81,7 @@ func TestShutdownWait(t *testing.T) {
 		Return(&server, nil, nil).
 		Return(&hcloud.Server{ID: server.ID, Name: server.Name, Status: hcloud.ServerStatusOff}, nil, nil)
 
-	out, err := fx.Run(cmd, []string{server.Name, "--wait"})
+	out, _, err := fx.Run(cmd, []string{server.Name, "--wait"})
 
 	expOut := "Sent shutdown signal to server 42\nWaiting for server to shut down ... done\nServer 42 shut down\n"
 
diff --git a/internal/cmd/server/update_test.go b/internal/cmd/server/update_test.go
index 5e813733d..8d02ead8a 100644
--- a/internal/cmd/server/update_test.go
+++ b/internal/cmd/server/update_test.go
@@ -29,7 +29,7 @@ func TestUpdateName(t *testing.T) {
 			Name: "new-name",
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
+	out, _, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
 
 	expOut := "Server 123 updated\n"
 
diff --git a/internal/cmd/servertype/describe_test.go b/internal/cmd/servertype/describe_test.go
index 5a998a517..cf8c68c72 100644
--- a/internal/cmd/servertype/describe_test.go
+++ b/internal/cmd/servertype/describe_test.go
@@ -34,7 +34,7 @@ func TestDescribe(t *testing.T) {
 			StorageType: hcloud.StorageTypeLocal,
 		}, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"cax11"})
+	out, _, err := fx.Run(cmd, []string{"cax11"})
 
 	expOut := `ID:			45
 Name:			cax11
diff --git a/internal/cmd/servertype/list_test.go b/internal/cmd/servertype/list_test.go
index 7651a795a..04603095a 100644
--- a/internal/cmd/servertype/list_test.go
+++ b/internal/cmd/servertype/list_test.go
@@ -44,7 +44,7 @@ func TestList(t *testing.T) {
 			},
 		}, nil)
 
-	out, err := fx.Run(cmd, []string{})
+	out, _, err := fx.Run(cmd, []string{})
 
 	expOut := `ID    NAME   CORES   CPU TYPE   ARCHITECTURE   MEMORY   DISK    STORAGE TYPE   TRAFFIC
 123   test   2       shared     arm            8.0 GB   80 GB   local          20 TB
diff --git a/internal/cmd/sshkey/create_test.go b/internal/cmd/sshkey/create_test.go
index a296300fa..8d62bd4f8 100644
--- a/internal/cmd/sshkey/create_test.go
+++ b/internal/cmd/sshkey/create_test.go
@@ -34,7 +34,7 @@ func TestCreate(t *testing.T) {
 			PublicKey: "test",
 		}, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"--name", "test", "--public-key", "test"})
+	out, _, err := fx.Run(cmd, []string{"--name", "test", "--public-key", "test"})
 
 	expOut := "SSH key 123 created\n"
 
diff --git a/internal/cmd/sshkey/delete_test.go b/internal/cmd/sshkey/delete_test.go
index 5badfa23f..5129211a9 100644
--- a/internal/cmd/sshkey/delete_test.go
+++ b/internal/cmd/sshkey/delete_test.go
@@ -34,7 +34,7 @@ func TestDelete(t *testing.T) {
 		Delete(gomock.Any(), sshKey).
 		Return(nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := "SSH Key test deleted\n"
 
diff --git a/internal/cmd/sshkey/describe_test.go b/internal/cmd/sshkey/describe_test.go
index e5658f23b..57b229cc8 100644
--- a/internal/cmd/sshkey/describe_test.go
+++ b/internal/cmd/sshkey/describe_test.go
@@ -39,7 +39,7 @@ func TestDescribe(t *testing.T) {
 		Get(gomock.Any(), "test").
 		Return(key, nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := fmt.Sprintf(`ID:		123
 Name:		test
diff --git a/internal/cmd/sshkey/labels_test.go b/internal/cmd/sshkey/labels_test.go
index 09d62562c..0abd5cecb 100644
--- a/internal/cmd/sshkey/labels_test.go
+++ b/internal/cmd/sshkey/labels_test.go
@@ -31,7 +31,7 @@ func TestLabelAdd(t *testing.T) {
 			},
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key=value"})
+	out, _, err := fx.Run(cmd, []string{"123", "key=value"})
 
 	expOut := "Label key added to SSH Key 123\n"
 
@@ -62,7 +62,7 @@ func TestLabelRemove(t *testing.T) {
 			Labels: make(map[string]string),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key"})
+	out, _, err := fx.Run(cmd, []string{"123", "key"})
 
 	expOut := "Label key removed from SSH Key 123\n"
 
diff --git a/internal/cmd/sshkey/list_test.go b/internal/cmd/sshkey/list_test.go
index 5d846b787..d5f7a5017 100644
--- a/internal/cmd/sshkey/list_test.go
+++ b/internal/cmd/sshkey/list_test.go
@@ -37,7 +37,7 @@ func TestList(t *testing.T) {
 			},
 		}, nil)
 
-	out, err := fx.Run(cmd, []string{})
+	out, _, err := fx.Run(cmd, []string{})
 
 	expOut := `ID    NAME   FINGERPRINT   AGE
 123   test   -             1h
diff --git a/internal/cmd/sshkey/update_test.go b/internal/cmd/sshkey/update_test.go
index 879dc96e5..f17f0d526 100644
--- a/internal/cmd/sshkey/update_test.go
+++ b/internal/cmd/sshkey/update_test.go
@@ -29,7 +29,7 @@ func TestUpdateName(t *testing.T) {
 			Name: "new-name",
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
+	out, _, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
 
 	expOut := "SSHKey 123 updated\n"
 
diff --git a/internal/cmd/volume/create_test.go b/internal/cmd/volume/create_test.go
index 36feb46ac..837157c83 100644
--- a/internal/cmd/volume/create_test.go
+++ b/internal/cmd/volume/create_test.go
@@ -44,7 +44,7 @@ func TestCreate(t *testing.T) {
 	fx.ActionWaiter.EXPECT().
 		WaitForActions(gomock.Any(), []*hcloud.Action{{ID: 1}, {ID: 2}, {ID: 3}})
 
-	out, err := fx.Run(cmd, []string{"--name", "test", "--size", "20", "--location", "fsn1"})
+	out, _, err := fx.Run(cmd, []string{"--name", "test", "--size", "20", "--location", "fsn1"})
 
 	expOut := "Volume 123 created\n"
 
@@ -94,7 +94,7 @@ func TestCreateProtection(t *testing.T) {
 	fx.ActionWaiter.EXPECT().
 		ActionProgress(gomock.Any(), &hcloud.Action{ID: 123})
 
-	out, err := fx.Run(cmd, []string{"--name", "test", "--size", "20", "--location", "fsn1", "--enable-protection", "delete"})
+	out, _, err := fx.Run(cmd, []string{"--name", "test", "--size", "20", "--location", "fsn1", "--enable-protection", "delete"})
 
 	expOut := `Volume 123 created
 Resource protection enabled for volume 123
diff --git a/internal/cmd/volume/delete_test.go b/internal/cmd/volume/delete_test.go
index df1028d83..b3b05ddd9 100644
--- a/internal/cmd/volume/delete_test.go
+++ b/internal/cmd/volume/delete_test.go
@@ -34,7 +34,7 @@ func TestDelete(t *testing.T) {
 		Delete(gomock.Any(), volume).
 		Return(nil, nil)
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := "Volume test deleted\n"
 
diff --git a/internal/cmd/volume/describe_test.go b/internal/cmd/volume/describe_test.go
index 930da695f..322f63f4d 100644
--- a/internal/cmd/volume/describe_test.go
+++ b/internal/cmd/volume/describe_test.go
@@ -52,7 +52,7 @@ func TestDescribe(t *testing.T) {
 		ServerName(int64(321)).
 		Return("myServer")
 
-	out, err := fx.Run(cmd, []string{"test"})
+	out, _, err := fx.Run(cmd, []string{"test"})
 
 	expOut := fmt.Sprintf(`ID:		123
 Name:		test
diff --git a/internal/cmd/volume/labels_test.go b/internal/cmd/volume/labels_test.go
index 1f598b643..28c4ba3f5 100644
--- a/internal/cmd/volume/labels_test.go
+++ b/internal/cmd/volume/labels_test.go
@@ -31,7 +31,7 @@ func TestLabelAdd(t *testing.T) {
 			},
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key=value"})
+	out, _, err := fx.Run(cmd, []string{"123", "key=value"})
 
 	expOut := "Label key added to Volume 123\n"
 
@@ -62,7 +62,7 @@ func TestLabelRemove(t *testing.T) {
 			Labels: make(map[string]string),
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "key"})
+	out, _, err := fx.Run(cmd, []string{"123", "key"})
 
 	expOut := "Label key removed from Volume 123\n"
 
diff --git a/internal/cmd/volume/list_test.go b/internal/cmd/volume/list_test.go
index 4e00ae9b5..e8cd7e35a 100644
--- a/internal/cmd/volume/list_test.go
+++ b/internal/cmd/volume/list_test.go
@@ -43,7 +43,7 @@ func TestList(t *testing.T) {
 		ServerName(int64(321)).
 		Return("myServer")
 
-	out, err := fx.Run(cmd, []string{})
+	out, _, err := fx.Run(cmd, []string{})
 
 	expOut := `ID    NAME   SIZE    SERVER     LOCATION   AGE
 123   test   50 GB   myServer   fsn1       1h
diff --git a/internal/cmd/volume/update_test.go b/internal/cmd/volume/update_test.go
index c783c02fb..40e9a882e 100644
--- a/internal/cmd/volume/update_test.go
+++ b/internal/cmd/volume/update_test.go
@@ -29,7 +29,7 @@ func TestUpdateName(t *testing.T) {
 			Name: "new-name",
 		})
 
-	out, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
+	out, _, err := fx.Run(cmd, []string{"123", "--name", "new-name"})
 
 	expOut := "Volume 123 updated\n"
 
diff --git a/internal/testutil/fixture.go b/internal/testutil/fixture.go
index 83b31beb7..273bb2123 100644
--- a/internal/testutil/fixture.go
+++ b/internal/testutil/fixture.go
@@ -37,9 +37,9 @@ func (f *Fixture) ExpectEnsureToken() {
 
 // Run runs the given cobra command with the given arguments and returns stdout output and a
 // potential error.
-func (f *Fixture) Run(cmd *cobra.Command, args []string) (string, error) {
+func (f *Fixture) Run(cmd *cobra.Command, args []string) (string, string, error) {
 	cmd.SetArgs(args)
-	return CaptureStdout(cmd.Execute)
+	return CaptureOutStreams(cmd.Execute)
 }
 
 // Finish must be called after the test is finished, preferably via `defer` directly after
diff --git a/internal/testutil/testing.go b/internal/testutil/testing.go
index 3db55efae..5caa143ff 100644
--- a/internal/testutil/testing.go
+++ b/internal/testutil/testing.go
@@ -7,46 +7,58 @@ import (
 	"os"
 )
 
-// CaptureStdout redirects stdout while running fn and returns the output as a string.
+// CaptureOutStreams redirects stdout & stderr while running fn and returns the outputs as a string.
 // If there's an error during capture, it returns the error, otherwise it returns the error
 // returned by fn.
-func CaptureStdout(fn func() error) (string, error) {
-	r, w, err := os.Pipe()
+func CaptureOutStreams(fn func() error) (string, string, error) {
+	outR, outW, err := os.Pipe()
 	if err != nil {
-		return "", fmt.Errorf("capture stdout: %v", err)
+		return "", "", fmt.Errorf("capture stdout: %v", err)
+	}
+	errR, errW, err := os.Pipe()
+	if err != nil {
+		return "", "", fmt.Errorf("capture stderr: %v", err)
 	}
 
-	origOut := os.Stdout
+	origOut, origErr := os.Stdout, os.Stderr
 	defer func() {
 		os.Stdout = origOut
+		os.Stderr = origErr
 	}()
+	os.Stdout, os.Stderr = outW, errW
 
-	buf := &bytes.Buffer{}
-	os.Stdout = w
+	outBuf, errBuf := &bytes.Buffer{}, &bytes.Buffer{}
 
-	copyDone := make(chan struct{})
-	var copyErr error
+	var copyErr = make(chan error)
 	go func() {
-		defer close(copyDone)
+		defer close(copyErr)
 
-		copied, err := io.Copy(buf, r)
+		copied, err := io.Copy(outBuf, outR)
 		if err != nil {
-			copyErr = fmt.Errorf("capture stdout: %v, copied: %d\n", err, copied)
+			copyErr <- fmt.Errorf("capture stdout: %v, copied: %d", err, copied)
+			return
+		}
+
+		copied, err = io.Copy(errBuf, errR)
+		if err != nil {
+			copyErr <- fmt.Errorf("capture stderr: %v, copied: %d", err, copied)
 			return
 		}
 	}()
 
 	err = fn()
 
-	if copyErr != nil {
-		return "", copyErr
+	if err := outW.Close(); err != nil {
+		return "", "", fmt.Errorf("capture stdout close pipe writer: %v", err)
 	}
 
-	if err := w.Close(); err != nil {
-		return "", fmt.Errorf("capture stdout close pipe reader: %v", err)
+	if err := errW.Close(); err != nil {
+		return "", "", fmt.Errorf("capture stderr close pipe writer: %v", err)
 	}
 
-	<-copyDone
+	if err := <-copyErr; err != nil {
+		return "", "", err
+	}
 
-	return buf.String(), err
+	return outBuf.String(), errBuf.String(), err
 }