diff --git a/containers/buildbot-linux/entrypoint.sh b/containers/buildbot-linux/entrypoint.sh
index e425a8f..6138d90 100755
--- a/containers/buildbot-linux/entrypoint.sh
+++ b/containers/buildbot-linux/entrypoint.sh
@@ -39,16 +39,14 @@ if [[ -z "${BUILDBOT_ADDRESS+x}" ]]; then
   echo "Not starting buildbot as BUILDBOT_ADDRESS is not set"
 else
   buildbot-worker create-worker /build/buildbot $BUILDBOT_ADDRESS $BUILDBOT_NAME $BUILDBOT_PASSWORD
-  echo "llvm-premerge-buildbots <llvm-premerge-buildbots@google.com>" > /build/buildbot/info/admin
-  echo "Setup analogous to linux agent for Pull Request checks" > /build/buildbot/info/host
-  echo "Ubuntu 20, cmake-3.23.3, LLVM 16" >> /build/buildbot/info/host
+  unset BUILDBOT_ADDRESS
+  unset BUILDBOT_NAME
+  unset BUILDBOT_PASSWORD
+  echo "llvm-premerge-buildbots <llvm-premerge-buildbots@google.com>, Mikhail Goncharov<goncharov.mikhail@gmail.com>" > /build/buildbot/info/admin
+  echo "Setup analogous to linux agent for Pull Request checks:" > /build/buildbot/info/host
+  echo "GCP machine c2d-standard-56 56vCPU 224Gb" >> /build/buildbot/info/host
+  echo "Ubuntu 20 cmake-3.23.3 python-3.10 ninja-1.10.1 LLVM-16" >> /build/buildbot/info/host
   echo "https://github.com/google/llvm-premerge-checks/blob/main/containers/buildbot-linux/Dockerfile" >> /build/buildbot/info/host
-  echo "lsb_release -a" >> /build/buildbot/info/host
-  lsb_release -a >> /build/buildbot/info/host
-  echo "lscpu" >> /build/buildbot/info/host
-  lscpu >> /build/buildbot/info/host
-  echo "dpkg -l" >> /build/buildbot/info/host
-  dpkg -l >> /build/buildbot/info/host
   chown -R ${USER}:${USER} /build/buildbot
   gosu "$USER" bash -c 'CC=clang CXX=clang++ LD=LLD buildbot-worker start /build/buildbot'
 fi
diff --git a/containers/buildbot-windows/entrypoint.sh b/containers/buildbot-windows/entrypoint.sh
index cc62f84..bcda2e4 100644
--- a/containers/buildbot-windows/entrypoint.sh
+++ b/containers/buildbot-windows/entrypoint.sh
@@ -13,13 +13,12 @@ sccache --show-stats
 echo "configure buildbot"
 mkdir -p /c/ws/buildbbot
 buildbot-worker create-worker /c/ws/buildbot $BUILDBOT_ADDRESS $BUILDBOT_NAME $BUILDBOT_PASSWORD
-
-echo "llvm-premerge-buildbots <llvm-premerge-buildbots@google.com>" > /c/ws/buildbot/info/admin
-echo "Setup analogous to windows agent for Pull Request checks" > /c/ws/buildbot/info/host
-echo "Windows ltsc2019, vs-2019, LLVM-16+" >> /c/ws/buildbot/info/host
+unset BUILDBOT_ADDRESS
+unset BUILDBOT_NAME
+unset BUILDBOT_PASSWORD
+echo "llvm-premerge-buildbots <llvm-premerge-buildbots@google.com>, Mikhail Goncharov<goncharov.mikhail@gmail.com>" > /c/ws/buildbot/info/admin
+echo "Setup analogous to windows agent for Pull Request checks:" > /c/ws/buildbot/info/host
+echo "GCP machine c2d-standard-32 AMD2 32vCPU 128Gb" >> /c/ws/buildbot/info/host
+echo "Windows ltsc2019 vs-2019 LLVM-16+ python 3.9.7 cmake" >> /c/ws/buildbot/info/host
 echo "https://github.com/google/llvm-premerge-checks/blob/main/containers/buildbot-windows/Dockerfile" >> /c/ws/buildbot/info/host
-echo "Get-WmiObject -Class Win32_Processor" >> /c/ws/buildbot/info/host
-powershell.exe -c "Get-WmiObject -Class Win32_Processor" >> /c/ws/buildbot/info/host
-echo "Get-WmiObject -Class Win32_Product" >> /c/ws/buildbot/info/host
-powershell.exe -c "Get-WmiObject -Class Win32_Product" >> /c/ws/buildbot/info/host
 $@
\ No newline at end of file