diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 434f36007..c5a4552a1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,7 +70,8 @@ jobs:
     runs-on: ubuntu-16.04
     needs: preBuild
     env:
-      BACKTRACE_TOKEN: ${{ secrets.BACKTRACE_TOKEN }}
+      BACKTRACE_SYMBOL_TOKEN: ${{ secrets.BACKTRACE_SYMBOL_TOKEN }}
+      BACKTRACE_MINIDUMP_TOKEN: ${{ secrets.BACKTRACE_MINIDUMP_TOKEN }}
       BITROCK_BUILDER: ~/installbuilder/bin/builder
     outputs:
       warnings: ${{ steps.warnings.outputs.warnings }}
@@ -148,7 +149,8 @@ jobs:
     runs-on: windows-2019
     needs: preBuild
     env:
-      BACKTRACE_TOKEN: ${{ secrets.BACKTRACE_TOKEN }}
+      BACKTRACE_SYMBOL_TOKEN: ${{ secrets.BACKTRACE_SYMBOL_TOKEN }}
+      BACKTRACE_MINIDUMP_TOKEN: ${{ secrets.BACKTRACE_MINIDUMP_TOKEN }}
       BITROCK_BUILDER: "$(USERPROFILE)/installbuilder/bin/builder-cli.exe"
     outputs:
       warnings: ${{ steps.warnings.outputs.warnings }}
@@ -231,7 +233,8 @@ jobs:
     runs-on: windows-2019
     needs: preBuild
     env:
-      BACKTRACE_TOKEN: ${{ secrets.BACKTRACE_TOKEN }}
+      BACKTRACE_SYMBOL_TOKEN: ${{ secrets.BACKTRACE_SYMBOL_TOKEN }}
+      BACKTRACE_MINIDUMP_TOKEN: ${{ secrets.BACKTRACE_MINIDUMP_TOKEN }}
       BITROCK_BUILDER: "$(USERPROFILE)/installbuilder/bin/builder-cli.exe"
     outputs:
       warnings: ${{ steps.warnings.outputs.warnings }}
@@ -308,7 +311,8 @@ jobs:
     runs-on: macos-10.15
     needs: preBuild
     env:
-      BACKTRACE_TOKEN: ${{ secrets.BACKTRACE_TOKEN }}
+      BACKTRACE_SYMBOL_TOKEN: ${{ secrets.BACKTRACE_SYMBOL_TOKEN }}
+      BACKTRACE_MINIDUMP_TOKEN: ${{ secrets.BACKTRACE_MINIDUMP_TOKEN }}
       BITROCK_BUILDER: /Applications/installbuilder/bin/Builder.app/Contents/MacOS/installbuilder.sh
     outputs:
       warnings: ${{ steps.warnings.outputs.warnings }}
diff --git a/scripts/build.py b/scripts/build.py
index d30fbf8af..abb4bc757 100644
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -250,7 +250,7 @@ class Builder:
     def __upload_symbol_files(self, symbols_package):
         print('Uploading symbols')
         url = 'https://swift-project.sp.backtrace.io:6098/post'
-        token = os.environ['BACKTRACE_TOKEN']
+        token = os.environ['BACKTRACE_SYMBOL_TOKEN']
 
         data = open(symbols_package, 'rb').read()
         params = (
diff --git a/src/blackconfig/buildconfig.h b/src/blackconfig/buildconfig.h
index f5f6fbede..15be1342b 100644
--- a/src/blackconfig/buildconfig.h
+++ b/src/blackconfig/buildconfig.h
@@ -118,6 +118,9 @@ namespace BlackConfig
         //! Vatsim client key
         static const QString &vatsimPrivateKey(); // defined in buildconfig_gen.cpp.in
 
+        //! Backtrace token for minidump uploads
+        static const QString &backtraceToken(); // defined in buildconfig_gen.cpp.in
+
         //! GitHub repository URL
         static const QString &gitHubRepoUrl();
 
diff --git a/src/blackconfig/buildconfig_gen.cpp.in b/src/blackconfig/buildconfig_gen.cpp.in
index 0a798ce03..843be9e5d 100644
--- a/src/blackconfig/buildconfig_gen.cpp.in
+++ b/src/blackconfig/buildconfig_gen.cpp.in
@@ -30,6 +30,12 @@ const QString &BlackConfig::CBuildConfig::vatsimPrivateKey()
     return pk;
 }
 
+const QString &BlackConfig::CBuildConfig::backtraceToken()
+{
+    static const auto bt = QString { \"$$(BACKTRACE_MINIDUMP_TOKEN)\" };
+    return bt;
+}
+
 const QString &BlackConfig::CBuildConfig::gitHeadSha1()
 {
     static const QString gitHeadSha1(\"$$GIT_HEAD_SHA1\");
diff --git a/src/blackmisc/crashhandler.cpp b/src/blackmisc/crashhandler.cpp
index 3c9dda706..5ecca08a5 100644
--- a/src/blackmisc/crashhandler.cpp
+++ b/src/blackmisc/crashhandler.cpp
@@ -68,7 +68,7 @@ namespace BlackMisc
         std::map<std::string, std::string> annotations;
 
         // Backtrace annotations
-        annotations["token"]         = "b15efd93e290be3cf5d39750cadc092b651327ff0c027b80abd75e0ee50df1da";
+        annotations["token"]         = CBuildConfig::backtraceToken().toStdString();
         annotations["format"]        = "minidump";
         annotations["commit"]        = CBuildConfig::gitHeadSha1().toStdString();
         annotations["version"]       = CBuildConfig::getVersionString().toStdString();