diff --git a/internal/updater/key_default.go b/internal/updater/key_default.go
index 73fe0e28..f92e159b 100644
--- a/internal/updater/key_default.go
+++ b/internal/updater/key_default.go
@@ -15,61 +15,47 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !build_qa
-
 package updater
 
 // DefaultPublicKey is the public key used to sign builds.
 const DefaultPublicKey = `-----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-qdwhrw==
-=mu62
+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
+=lAy0
 -----END PGP PUBLIC KEY BLOCK-----`
diff --git a/internal/updater/key_qa.go b/internal/updater/key_qa.go
deleted file mode 100644
index 601926ce..00000000
--- a/internal/updater/key_qa.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) 2020 Proton Technologies AG
-//
-// This file is part of ProtonMail Bridge.
-//
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// ProtonMail Bridge is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-
-// +build build_qa
-
-package updater
-
-// DefaultPublicKey is the public key used to sign builds.
-const DefaultPublicKey = `-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBF9Q55wBCADiwBHGCyJiO2ZSDh9ZPecFKnf+JEryzqGYu3jImEoV2X5Bx/Kl
-5n3hHvao9jekEDFr1AjvSKfG9Zz/1GdionUUEdw76mkc7y09GKdXENOyCQYs7CV7
-WbWDSGSmp6DVBcRzRzMKm4zuB208a6Wwd2aYqIJ9Oo0l3ypQnox0BQCbbqewYSYN
-Dmj+WJkO+e2ovJQWrQgtpnj/QBX18KBjP4FiLSPHAyy7aC2t6JlTIz8UVAw2VZFn
-GBUUqnn0iy3W0nJNgv1ouo0rCa+eYBpz3n+GKTFWFDTIPQfZbh15nFJJgBSuiwyM
-sHjWCNJYu5PQmwNlGJJjtKw/9xgTFLC9yaNPABEBAAG0BkJyaWRnZYkBTgQTAQgA
-OBYhBH3hU445a9yHH+QknbtAQ7nyijPUBQJfUOecAhsDBQsJCAcCBhUKCQgLAgQW
-AgMBAh4BAheAAAoJELtAQ7nyijPUpisH/iznWGoma1PXpaQlD2241k9zSzg3Nczn
-yfm2mYtXlGVvjGLr29neErWpLy0Kb2ihKTTsgMkwSwcasBap8HYTtENNl1nUzQL7
-UhaASTzZ2jYw4Dypps+DYpoLm9RUWKHuUOE5Ov8QPjTBC/BswA0Lv1Z9u9t5qsdp
-UgB+YVYgRC+zSHMIzWSMx0dCSPgRilkPvIa5wB77J1+ZE7y1n/uQXOYrKitWrf+w
-tXcRYoPqYQ4KXIQ/PMCTwSEDDbsPD7F09AzYQPv6D20d7dyEf0/hlfpj+cvGyBG0
-GdGLjwjjKNA99ra1IXjgBUIEv/XpijfKK2D0FDiOdZi3JnVr8OYBCeW5AQ0EX1Dn
-nAEIAMtD5sLJ3hXE/bKRQaINx+7hzYhFOxzdGdOTlzlzEjsWYLmy2cWb2fjazIhf
-37g8HlSlMaHtHkdJIn1hS9+N76GxEChH31tF6Cuyz+k6TRqroNHsIxzOIjv3+qkM
-7xWPRhq8msB8ulWKBQtWpwVVC3sa/qTh9k29wuEiwQY0IxLV0a6BkE1TqK5/7A6Q
-o8SMCvQW6wAxPZMhPM/FwxMYxrKUT3UUDmRYS5RvSlMGUwK2HucQVU/qwsOPkJs4
-wq6RI+5NDtyGxMxUKod/GYpPaICUI/VNgIZXX6NNzS7JYEYBjtI/JOEOc0yQSh1u
-jEGl1k+4OLogUiV02mpGCrHutm0AEQEAAYkBNgQYAQgAIBYhBH3hU445a9yHH+Qk
-nbtAQ7nyijPUBQJfUOecAhsMAAoJELtAQ7nyijPU/wUIAKibg4GFxHFSiEjtzdlO
-2cIIr3yCsFmGFYVLF3JkOtVvQk7QDZTNsx5ZqC+Mtlf3Z04btG5M/FpHQ097orfl
-IH+bZVXMrYtzd4J7ujKGEJU2hY6a9j50odsiwl6CSrXdppS7RGdkhui0RCke/y9Z
-wJU5oyiWmcsQfhnET7DEpI7twqEwg43VBGOnaRxKFecyYsQVASlrWMENEpoaup8B
-oIS2nDvMVSSK77tmkNcLt8911VqZPtOYmxzM5rc+gm7Pn9kSZUXoGy4p5sFDu/mj
-zT1w+Qev2GlSVwFdKPasefLmb3lBEbNeZAkfFl48WEzwtK3VJM60Xl8RPFk0IKLe
-tXw=
-=aaxG
------END PGP PUBLIC KEY BLOCK-----`
diff --git a/utils/versioner/main.go b/utils/versioner/main.go
index 9f033abc..4ad802b4 100644
--- a/utils/versioner/main.go
+++ b/utils/versioner/main.go
@@ -166,14 +166,14 @@ func fetch(app, platform string) map[string]versionInfo {
 
 	res, err := resty.New().R().Get(url)
 	if err != nil {
-		println("fetch failed", err.Error())
+		logrus.WithError(err).Error("Fetch failed.")
 		return make(map[string]versionInfo)
 	}
 
 	var versionMap map[string]versionInfo
 
 	if err := json.Unmarshal(res.Body(), &versionMap); err != nil {
-		println("unmarshal failed", err.Error())
+		logrus.WithError(err).Error("Unmarshal failed.")
 		return make(map[string]versionInfo)
 	}