diff --git a/linux/teamcity/agent/Makefile b/linux/teamcity/agent/Makefile
index a1e173ea9..82c5a2de6 100644
--- a/linux/teamcity/agent/Makefile
+++ b/linux/teamcity/agent/Makefile
@@ -1,4 +1,5 @@
-all: tca
-tca:
-	docker build --compress -t epicmorg/teamcity-agent:latest .
-	docker push epicmorg/teamcity-agent:latest
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/teamcity/agent/docker-compose.yml b/linux/teamcity/agent/docker-compose.yml
new file mode 100644
index 000000000..9190c2827
--- /dev/null
+++ b/linux/teamcity/agent/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/teamcity-agent:latest"
+    build:
+      context: .
diff --git a/linux/teamcity/server/Makefile b/linux/teamcity/server/Makefile
index ef347f552..82c5a2de6 100644
--- a/linux/teamcity/server/Makefile
+++ b/linux/teamcity/server/Makefile
@@ -1,4 +1,5 @@
-all: tcs
-tcs:
-	docker build --compress -t epicmorg/teamcity-server:latest .
-	docker push epicmorg/teamcity-server:latest
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/teamcity/server/docker-compose.yml b/linux/teamcity/server/docker-compose.yml
new file mode 100644
index 000000000..ca5f2ec95
--- /dev/null
+++ b/linux/teamcity/server/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/teamcity-server:latest"
+    build:
+      context: .