diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b1072f2b..4ef86394 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: Upload macOS (amd64) Build Artifact
-          path: dist/hcloud-macos-build_darwin_amd64/hcloud
+          path: dist/hcloud-macos-build_darwin_amd64_v1/hcloud
       - uses: actions/upload-artifact@v2
         with:
           name: Upload macOS (arm64) Build Artifact
@@ -51,12 +51,12 @@ jobs:
       - uses: actions/upload-artifact@v1
         with:
           name: Upload Windows AMD64 Build Artifact
-          path: dist/hcloud-build_windows_amd64/hcloud.exe
+          path: dist/hcloud-build_windows_amd64_v1/hcloud.exe
       - uses: actions/upload-artifact@v1
         with:
           name: Upload Linux AMD64 Build Artifact
-          path: dist/hcloud-build_linux_amd64/hcloud
+          path: dist/hcloud-build_linux_amd64_v1/hcloud
       - uses: actions/upload-artifact@v1
         with:
           name: Upload FreeBSD AMD64 Build Artifact
-          path: dist/hcloud-build_freebsd_amd64/hcloud
+          path: dist/hcloud-build_freebsd_amd64_v1/hcloud
diff --git a/.goreleaser.yml b/.goreleaser.yml
index d8adc158..2b719f1d 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -31,7 +31,7 @@ builds:
     goarch:
       - amd64
     hooks:
-      post: gon gon.hcl
+      post: gon -log-level DEBUG gon.hcl
   - id: "hcloud-macos-arm-build"
     main: ./cmd/hcloud/main.go
     binary: hcloud
@@ -44,7 +44,7 @@ builds:
     goarch:
       - arm64
     hooks:
-      post: gon gon_arm64.hcl
+      post: gon -log-level DEBUG gon_arm64.hcl
 
 before:
   hooks:
diff --git a/gon.hcl b/gon.hcl
index b426694d..19b1cd4e 100644
--- a/gon.hcl
+++ b/gon.hcl
@@ -1,4 +1,4 @@
-source = ["./dist/hcloud-macos-build_darwin_amd64/hcloud"]
+source = ["./dist/hcloud-macos-build_darwin_amd64_v1/hcloud"]
 bundle_id = "cloud.hetzner.cli"
 
 apple_id {
diff --git a/internal/cmd/server/enable_rescue.go b/internal/cmd/server/enable_rescue.go
index ae77e64f..b7159764 100644
--- a/internal/cmd/server/enable_rescue.go
+++ b/internal/cmd/server/enable_rescue.go
@@ -21,7 +21,7 @@ func newEnableRescueCommand(cli *state.State) *cobra.Command {
 		RunE:                  cli.Wrap(runEnableRescue),
 	}
 	cmd.Flags().String("type", "linux64", "Rescue type")
-	cmd.RegisterFlagCompletionFunc("type", cmpl.SuggestCandidates("linux64", "linux32", "freebsd64"))
+	cmd.RegisterFlagCompletionFunc("type", cmpl.SuggestCandidates("linux64", "linux32"))
 
 	cmd.Flags().StringSlice("ssh-key", nil, "ID or name of SSH key to inject (can be specified multiple times)")
 	cmd.RegisterFlagCompletionFunc("ssh-key", cmpl.SuggestCandidatesF(cli.SSHKeyNames))