diff --git a/apps/teamcity/docker-compose.yml b/apps/teamcity/docker-compose.yml
index 0111b081c..217c2c8c5 100644
--- a/apps/teamcity/docker-compose.yml
+++ b/apps/teamcity/docker-compose.yml
@@ -1,38 +1,38 @@
 # image: https://hub.docker.com/r/jetbrains/teamcity-server
 # docs: https://www.jetbrains.com/help/teamcity/teamcity-documentation.html
-# docker: https://github.com/JetBrains/teamcity-docker-server
+# https://github.com/JetBrains/teamcity-docker-server
 # compose: https://github.com/JetBrains/teamcity-docker-samples/blob/master/compose-ubuntu/docker-compose.yml
 
 version: '3.8'
 services:
   teamcity-server:
-    image: ${W9_REPO}:${W9_VERSION}
-    container_name: ${W9_ID}
+    image: jetbrains/teamcity-server:${W9_VERSION}
+    container_name: ${W9_NAME}
     restart: unless-stopped
     depends_on:
       - teamcity-db
     env_file: .env
     ports:
-      - "${W9_HTTP_PORT_SET}:8111"
+      - "${W9_HTTP_PORT}:8111"
     volumes:
       - data:/data/teamcity_server/datadir
       - logs:/opt/teamcity/logs
 
   teamcity-agent-1:
-    image: ${W9_REPO}:${W9_VERSION}-linux-sudo
+    image: jetbrains/teamcity-agent:${W9_VERSION}-linux-sudo
     privileged: true
     volumes:
-      - ./src/agents/agent1/conf:/data/teamcity_agent/conf
+      - ./src/agents/agent1-1/conf:/data/teamcity_agent/conf
     environment:
       - DOCKER_IN_DOCKER=start
      
   teamcity-db:
     image: mysql:8.0
-    container_name: ${W9_ID}-db 
+    container_name: ${W9_NAME}-db 
     environment:
       - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWORD}
-      - MYSQL_DATABASE=${W9_ID}
-      - MYSQL_USER=${W9_ID}
+      - MYSQL_DATABASE=${W9_NAME}
+      - MYSQL_USER=${W9_NAME}
       - MYSQL_PASSWORD=${W9_POWER_PASSWORD}
     volumes:
       - mysql_data:/var/lib/mysql
diff --git a/apps/teamcity/src/agents/agent-1/conf/buildAgent.properties b/apps/teamcity/src/agents/agent-1/conf/buildAgent.properties
new file mode 100644
index 000000000..9657e081a
--- /dev/null
+++ b/apps/teamcity/src/agents/agent-1/conf/buildAgent.properties
@@ -0,0 +1,12 @@
+name=Agent 1-2
+ownPort=9090
+serverUrl=http\://teamcity\:8111
+
+workDir=../work
+tempDir=../temp
+systemDir=../system
+
+teamcity.docker.use.sudo=true
+
+
+authorizationToken=71723e836df10d65390420820fe3451c
diff --git a/apps/teamcity/src/agents/agent-2/conf/buildAgent.properties b/apps/teamcity/src/agents/agent-2/conf/buildAgent.properties
new file mode 100644
index 000000000..1ed8768d4
--- /dev/null
+++ b/apps/teamcity/src/agents/agent-2/conf/buildAgent.properties
@@ -0,0 +1,12 @@
+name=Agent 2-1
+ownPort=9090
+serverUrl=http\://teamcity\:8111
+
+workDir=../work
+tempDir=../temp
+systemDir=../system
+
+teamcity.docker.use.sudo=true
+
+
+authorizationToken=5881d299516ed1b39a3ce8c2dc05ee00
diff --git a/apps/teamcity/src/agents/agent1/conf/buildAgent.properties b/apps/teamcity/src/agents/agent1/conf/buildAgent.properties
deleted file mode 100644
index 8dc607cd1..000000000
--- a/apps/teamcity/src/agents/agent1/conf/buildAgent.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-name=Agent1
-ownPort=9090
-serverUrl=http\://${W9_ID}\:8111
-
-workDir=../work
-tempDir=../temp
-systemDir=../system
-
-teamcity.docker.use.sudo=true
-
-
-authorizationToken=71723e836df10d65390420820fe3451c
\ No newline at end of file