diff --git a/opencloud/docker/Dockerfile.multiarch b/opencloud/docker/Dockerfile.multiarch
index 0d859da151..7fc4dec880 100644
--- a/opencloud/docker/Dockerfile.multiarch
+++ b/opencloud/docker/Dockerfile.multiarch
@@ -3,7 +3,7 @@ ARG TARGETOS
 ARG TARGETARCH
 ARG VERSION
 ARG STRING
-ARG EDITION
+ARG EDITION="dev"
 
 RUN apk add bash make git curl gcc musl-dev libc-dev binutils-gold inotify-tools vips-dev
 
diff --git a/pkg/version/version.go b/pkg/version/version.go
index d7aed0934a..3bbf55506f 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -79,8 +79,11 @@ func initEdition() error {
 		_, err := semver.NewVersion(editionParts[1])
 		return err == nil
 	}) {
-		Edition = Dev
-		return fmt.Errorf(`unknown edition channel "%s"`, Edition)
+		defer func() {
+			Edition = Dev
+		}()
+
+		return fmt.Errorf(`unknown edition channel '%s'`, Edition)
 	}
 
 	return nil
diff --git a/pkg/version/version_test.go b/pkg/version/version_test.go
index 217a5099bf..080021064e 100644
--- a/pkg/version/version_test.go
+++ b/pkg/version/version_test.go
@@ -2,6 +2,7 @@ package version_test
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/opencloud-eu/opencloud/pkg/version"
@@ -59,6 +60,8 @@ func TestChannel(t *testing.T) {
 				fallthrough
 			case test.valid != (err == nil):
 				t.Fatalf("invalid edition: %s", version.Edition)
+			case !test.valid && !strings.Contains(err.Error(), "'"+test.got+"'"):
+				t.Fatalf("no mention of invalid edition '%s' in error: %s", test.got, err.Error())
 			}
 		})
 	}