diff --git a/.teamcity/patches/buildTypes/AggregatorBuild.kts b/.teamcity/patches/buildTypes/AggregatorBuild.kts
deleted file mode 100644
index 340f6798..00000000
--- a/.teamcity/patches/buildTypes/AggregatorBuild.kts
+++ /dev/null
@@ -1,16 +0,0 @@
-package patches.buildTypes
-
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
-
-/*
-This patch script was generated by TeamCity on settings change in UI.
-To apply the patch, change the buildType with id = 'AggregatorBuild'
-accordingly, and delete the patch script.
-*/
-changeBuildType(RelativeId("AggregatorBuild")) {
-    vcs {
-        remove(DslContext.settingsRoot.id!!)
-        add(RelativeId("GoDelveDelve1"))
-    }
-}
diff --git a/.teamcity/patches/vcsRoots/GoDelveDelve1.kts b/.teamcity/patches/vcsRoots/GoDelveDelve1.kts
deleted file mode 100644
index a7674239..00000000
--- a/.teamcity/patches/vcsRoots/GoDelveDelve1.kts
+++ /dev/null
@@ -1,23 +0,0 @@
-package patches.vcsRoots
-
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
-
-/*
-This patch script was generated by TeamCity on settings change in UI.
-To apply the patch, create a vcsRoot with id = 'GoDelveDelve1'
-in the root project, and delete the patch script.
-*/
-create(DslContext.projectId, GitVcsRoot({
-    id("GoDelveDelve1")
-    name = "go-delve/delve (1)"
-    url = "https://github.com/go-delve/delve"
-    branch = "refs/heads/master"
-    branchSpec = "+:refs/heads/feature-*"
-    authMethod = password {
-        userName = "DelveBot"
-        password = "credentialsJSON:ae622caf-644c-4e69-bba8-2bea3e677ae9"
-    }
-}))
-
diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
index 9e0224bb..6672672a 100644
--- a/.teamcity/settings.kts
+++ b/.teamcity/settings.kts
@@ -49,7 +49,10 @@ val targets = arrayOf(
         "windows/amd64/tip",
 
         "mac/amd64/1.16",
-        "mac/amd64/tip"
+        "mac/amd64/tip",
+
+        "mac/arm64/1.16",
+        "mac/arm64/tip"
 )
 
 project {
@@ -92,7 +95,7 @@ class AggregatorBuild(tests: Collection<BuildType>) : BuildType({
             vcsRootExtId = "${DslContext.settingsRoot.id}"
             provider = github {
                 authType = token {
-                    token = "credentialsJSON:5dc93081-e0b2-41e2-b8f0-dea3c96e6426"
+                    token = "credentialsJSON:a7e7526c-7195-4790-bbb6-9fb4692f92d0"
                 }
                 filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
             }
@@ -102,7 +105,7 @@ class AggregatorBuild(tests: Collection<BuildType>) : BuildType({
             publisher = github {
                 githubUrl = "https://api.github.com"
                 authType = personalToken {
-                    token = "credentialsJSON:48af6e38-536d-4acb-ae2d-2fba57b6f3db"
+                    token = "credentialsJSON:a7e7526c-7195-4790-bbb6-9fb4692f92d0"
                 }
             }
             param("github_oauth_user", "")
@@ -231,7 +234,7 @@ class TestBuild(val os: String, val arch: String, version: String, buildId: Abso
             vcsRootExtId = "${DslContext.settingsRoot.id}"
             provider = github {
                 authType = token {
-                    token = "credentialsJSON:5dc93081-e0b2-41e2-b8f0-dea3c96e6426"
+                    token = "credentialsJSON:a7e7526c-7195-4790-bbb6-9fb4692f92d0"
                 }
                 filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
             }