diff --git a/contrib/source-control-tools/automated-commits.sh b/contrib/source-control-tools/automated-commits.sh
--- a/contrib/source-control-tools/automated-commits.sh
+++ b/contrib/source-control-tools/automated-commits.sh
@@ -235,26 +235,12 @@
     ;;
 
   update-seeds)
-    # Assumes seeder instances are already running on mainnet and testnet
-    pushd "${TOPLEVEL}"/contrib/seeds
-    : "${SEEDS_MAIN:=seeds_main.txt}"
-    ./makeseeds.py < "${SEEDS_MAIN}" > nodes_main.txt
-    git add nodes_main.txt
-
-    : "${SEEDS_TEST:=seeds_test.txt}"
-    ./makeseeds.py < "${SEEDS_TEST}" > nodes_test.txt
-    git add nodes_test.txt
-
-    SEEDS_HEADER="${TOPLEVEL}"/src/chainparamsseeds.h
-    ./generate-seeds.py . > "${SEEDS_HEADER}"
-    git add "${SEEDS_HEADER}"
-    popd
+    TEAMCITY_DIR="${TOPLEVEL}"/contrib/teamcity
+    "${TEAMCITY_DIR}"/build-configurations.py --config "${TEAMCITY_DIR}"/automated-commits.yml "${COMMIT_TYPE}"
 
-    # Check that seeds have good connectivity
-    "${DEVTOOLS_DIR}"/build_cmake.sh
-    SEEDS_DIR="${TOPLEVEL}"/contrib/seeds
-    RPC_PORT=18832 "${SEEDS_DIR}"/check-seeds.sh main 80
-    RPC_PORT=18833 "${SEEDS_DIR}"/check-seeds.sh test 70
+    git add "${TOPLEVEL}"/contrib/seeds/nodes_main.txt
+    git add "${TOPLEVEL}"/contrib/seeds/nodes_test.txt
+    git add "${TOPLEVEL}"/src/chainparamsseeds.h
 
     git commit -m "${BOT_PREFIX} Update seeds"
     ;;
diff --git a/contrib/teamcity/automated-commits.yml b/contrib/teamcity/automated-commits.yml
new file mode 100644
--- /dev/null
+++ b/contrib/teamcity/automated-commits.yml
@@ -0,0 +1,23 @@
+---
+builds:
+  update-seeds:
+    targets:
+      - - bitcoind
+        - bitcoin-cli
+    timeout: 900
+    post_build: |
+      # Assumes seeder instances are already running on mainnet and testnet
+      pushd "${TOPLEVEL}"/contrib/seeds
+      : "${SEEDS_MAIN:=seeds_main.txt}"
+      ./makeseeds.py < "${SEEDS_MAIN}" > nodes_main.txt
+
+      : "${SEEDS_TEST:=seeds_test.txt}"
+      ./makeseeds.py < "${SEEDS_TEST}" > nodes_test.txt
+
+      ./generate-seeds.py . > "${TOPLEVEL}"/src/chainparamsseeds.h
+      popd
+
+      # Check that seeds have good connectivity
+      SEEDS_DIR="${TOPLEVEL}"/contrib/seeds
+      RPC_PORT=18832 "${SEEDS_DIR}"/check-seeds.sh main 80
+      RPC_PORT=18833 "${SEEDS_DIR}"/check-seeds.sh test 70