diff --git a/docker-compose.yml b/docker-compose.yml
index b9b3684..55faa8d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,8 @@ services:
     build:
       context: telegram-client
       dockerfile: src/Nocr.TelegramClient.Host/Dockerfile
+    ports:
+      - 4999:8080
     environment:
       ASPNETCORE_ENVIRONMENT: Production
     depends_on:
@@ -25,6 +27,8 @@ services:
     build:
       context: text-matcher
       dockerfile: src/Nocr.TextMatcher.Host/Dockerfile
+    ports:
+      - 5001:8080
     environment:
       ASPNETCORE_ENVIRONMENT: DockerCompose
     depends_on:
@@ -32,15 +36,20 @@ services:
         condition: service_healthy
       nocr-text-matcher-db:
         condition: service_healthy
-  
-  nocr-text-matcher-db:
-    container_name: nocr-text-matcher-db
-    image: mariadb:latest
-    restart: always
-    ports:
-      - 3306:3306
+      nocr-text-matcher-migrator:
+        condition: service_completed_successfully
+
+  nocr-text-matcher-migrator:
+    build:
+      context: text-matcher
+      dockerfile: src/Nocr.TextMatcher.Migrator/Dockerfile
+    image: nocr-text-matcher-migrations:latest
+    container_name: nocr-text-matcher-migrator
     environment:
-      MARIADB_ROOT_PASSWORD: toor
+      DOTNET_ENVIRONMENT: DockerCompose
+    depends_on:
+      nocr-text-matcher-db:
+        condition: service_healthy
 
   nocr-telegram-listener:
     container_name: nocr-telegram-listener
@@ -48,6 +57,8 @@ services:
     build:
       context: telegram-listener
       dockerfile: src/Nocr.TelegramListener.Host/Dockerfile
+    ports:
+      - 5000:8080
     environment:
       ASPNETCORE_ENVIRONMENT: Production
     depends_on:
@@ -60,12 +71,58 @@ services:
     build:
       context: users
       dockerfile: src/Nocr.Users.Host/Dockerfile
+    ports:
+      - 4998:8080
     environment:
       ASPNETCORE_ENVIRONMENT: DockerCompose
     depends_on:
       nocr-rabbitmq:
         condition: service_healthy
+      nocr-users-migrator:
+        condition: service_completed_successfully
 
+  nocr-users-migrator:
+    build:
+      context: users
+      dockerfile: src/Nocr.Users.Migrator/Dockerfile
+    image: nocr-users-migrator:latest
+    container_name: nocr-users-migrator
+    environment:
+      DOTNET_ENVIRONMENT: DockerCompose
+    depends_on:
+      nocr-users-db:
+        condition: service_healthy
+
+  nocr-text-matcher-db:
+    container_name: nocr-text-matcher-db
+    image: mariadb:latest
+    restart: always
+    ports:
+      - 3306:3306
+    environment:
+      MARIADB_ROOT_PASSWORD: toor
+      MARIADB_DATABASE: nocr_text_matcher
+    healthcheck:
+      test: [ "CMD", "healthcheck.sh", "--connect", "--innodb_initialized" ]
+      interval: 5s
+      timeout: 10s
+      retries: 3
+
+  nocr-users-db:
+    container_name: nocr-users-db
+    image: mariadb:latest
+    restart: always
+    ports:
+      - 3307:3306
+    environment:
+      MARIADB_ROOT_PASSWORD: toor
+      MARIADB_DATABASE: nocr_users
+    healthcheck:
+      test: [ "CMD", "healthcheck.sh", "--connect", "--innodb_initialized" ]
+      interval: 5s
+      timeout: 10s
+      retries: 3
+  
   nocr-rabbitmq:
     image: rabbitmq:3-management-alpine
     container_name: nocr-rabbitmq
diff --git a/text-matcher b/text-matcher
index 1f5cc40..bb0a257 160000
--- a/text-matcher
+++ b/text-matcher
@@ -1 +1 @@
-Subproject commit 1f5cc40e540e6c4da5bf290f140d44396d3de6a0
+Subproject commit bb0a25727af92662cb5da48b121dc678b8285309
diff --git a/users b/users
index 2721f57..5cef1dc 160000
--- a/users
+++ b/users
@@ -1 +1 @@
-Subproject commit 2721f57b9c0db7c6cce88e595be96b34f666e113
+Subproject commit 5cef1dcb4cad82e43bf3b8a47693a2ca1b07acdb