diff --git a/.azure-pipelines/master.yml b/.azure-pipelines/master.yml
index e2baa923d99f7..9742c71965851 100644
--- a/.azure-pipelines/master.yml
+++ b/.azure-pipelines/master.yml
@@ -7,7 +7,7 @@ trigger:
   - master
 
 variables:
-- group: prod-credentials
+- group: real-prod-credentials
 
 pool:
   vmImage: ubuntu-16.04
diff --git a/.travis.yml b/.travis.yml
index 3d185b4f0c9ff..bc3cf920f4b99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -229,16 +229,6 @@ matrix:
       name: mingw-check
       if: type = pull_request OR branch = auto
 
-    - stage: publish toolstate
-      if: branch = master AND type = push
-      before_install: []
-      install: []
-      sudo: false
-      script:
-        MESSAGE_FILE=$(mktemp -t msg.XXXXXX);
-        . src/ci/docker/x86_64-gnu-tools/repo.sh;
-        commit_toolstate_change "$MESSAGE_FILE" "$TRAVIS_BUILD_DIR/src/tools/publish_toolstate.py" "$(git rev-parse HEAD)" "$(git log --format=%s -n1 HEAD)" "$MESSAGE_FILE" "$TOOLSTATE_REPO_ACCESS_TOKEN";
-
 before_install:
   # We'll use the AWS cli to download/upload cached docker layers as well as
   # push our deployments, so download that here.