diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
index c0a6c5432f..60e334f363 100644
--- a/.github/workflows/unit-tests.yaml
+++ b/.github/workflows/unit-tests.yaml
@@ -7,7 +7,7 @@ jobs:
   os-tests:
     strategy:
       matrix:
-        go-version: [1.16.x, 1.17.x]
+        go-version: [1.17.x, 1.18.x]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -31,7 +31,7 @@ jobs:
   build-tests:
     strategy:
       matrix:
-        go-version: [1.16.x, 1.17.x]
+        go-version: [1.17.x, 1.18.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/cmd/scw/main.go b/cmd/scw/main.go
index a531c1dae3..1f3f73165f 100644
--- a/cmd/scw/main.go
+++ b/cmd/scw/main.go
@@ -47,7 +47,7 @@ func cleanup(buildInfo *core.BuildInfo) {
 func buildVersion() string {
 	if Version == "" {
 		buildInfos, ok := debug.ReadBuildInfo()
-		if ok && buildInfos.Main.Version != "(devel)" {
+		if ok && buildInfos.Main.Version != "(devel)" && buildInfos.Main.Version != "" {
 			return buildInfos.Main.Version
 		}
 		return "v2+dev"