10 changed files with 82 additions and 547 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -53,8 +53,7 @@ steps:
        path: /root/.nuget/packages
    commands:
      - cd flea
-      - mkdir -p /root/.nuget/NuGet
-      - cp nuget.config /root/.nuget/NuGet/NuGet.Config
+      - dotnet nuget add source --name musk https://gitea.musk.fun/api/packages/nocr/nuget/index.json
      - echo "🔄 Restoring all projects..."
      - dotnet restore telegram-listener/Nocr.TelegramListener.sln
      - dotnet restore telegram-client/Nocr.TelegramClient.sln
@ -148,8 +147,7 @@ steps:
        path: /root/.nuget/packages
    commands:
      - cd flea
-      - mkdir -p /root/.nuget/NuGet
-      - cp nuget.config /root/.nuget/NuGet/NuGet.Config
+      - dotnet nuget add source --name musk https://gitea.musk.fun/api/packages/nocr/nuget/index.json
      - dotnet restore telegram-listener/Nocr.TelegramListener.sln
      - dotnet restore telegram-client/Nocr.TelegramClient.sln
      - dotnet restore text-matcher/Nocr.TextMatcher.sln
@ -252,8 +250,7 @@ steps:
        COMMIT_MSG=$(git log -1 --pretty=%B)
        if echo "$COMMIT_MSG" | grep -q "contracts_only:telegram_listener"; then
          echo "📦 Publishing telegram-listener contracts..."
-          mkdir -p /root/.nuget/NuGet
-          cp nuget.config /root/.nuget/NuGet/NuGet.Config
+          dotnet nuget add source --name musk https://gitea.musk.fun/api/packages/nocr/nuget/index.json
          dotnet pack telegram-listener/Nocr.TelegramListener.sln -o ./bin -p:PackageVersion=${DRONE_TAG}
          dotnet nuget push ./bin/*Contract*.nupkg --api-key $NUGETAPIKEY --source musk --skip-duplicate
        else
@ -276,8 +273,7 @@ steps:
        COMMIT_MSG=$(git log -1 --pretty=%B)
        if echo "$COMMIT_MSG" | grep -q "contracts_only:text_matcher"; then
          echo "📦 Publishing text-matcher contracts..."
-          mkdir -p /root/.nuget/NuGet
-          cp nuget.config /root/.nuget/NuGet/NuGet.Config
+          dotnet nuget add source --name musk https://gitea.musk.fun/api/packages/nocr/nuget/index.json
          dotnet pack text-matcher/Nocr.TextMatcher.sln -o ./bin -p:PackageVersion=${DRONE_TAG}
          dotnet nuget push ./bin/*Contract*.nupkg --api-key $NUGETAPIKEY --source musk --skip-duplicate
        else
@ -300,8 +296,7 @@ steps:
        COMMIT_MSG=$(git log -1 --pretty=%B)
        if echo "$COMMIT_MSG" | grep -q "contracts_only:users"; then
          echo "📦 Publishing users contracts..."
-          mkdir -p /root/.nuget/NuGet
-          cp nuget.config /root/.nuget/NuGet/NuGet.Config
+          dotnet nuget add source --name musk https://gitea.musk.fun/api/packages/nocr/nuget/index.json
          dotnet pack users/Nocr.Users.sln -o ./bin -p:PackageVersion=${DRONE_TAG}
          dotnet nuget push ./bin/*Contract*.nupkg --api-key $NUGETAPIKEY --source musk --skip-duplicate
        else
@ -376,8 +371,7 @@ steps:
        from_secret: nuget_musk_api_key
    commands:
      - cd flea
-      - mkdir -p /root/.nuget/NuGet
-      - cp nuget.config /root/.nuget/NuGet/NuGet.Config
+      - dotnet nuget add source --name musk https://gitea.musk.fun/api/packages/nocr/nuget/index.json
      - dotnet pack telegram-listener/Nocr.TelegramListener.sln -o ./bin -p:PackageVersion=${DRONE_TAG}
      - dotnet nuget push ./bin/*Contract*.nupkg --api-key $NUGETAPIKEY --source musk --skip-duplicate
    depends_on:
@ -393,8 +387,7 @@ steps:
        from_secret: nuget_musk_api_key
    commands:
      - cd flea
-      - mkdir -p /root/.nuget/NuGet
-      - cp nuget.config /root/.nuget/NuGet/NuGet.Config
+      - dotnet nuget add source --name musk https://gitea.musk.fun/api/packages/nocr/nuget/index.json
      - dotnet pack text-matcher/Nocr.TextMatcher.sln -o ./bin -p:PackageVersion=${DRONE_TAG}
      - dotnet nuget push ./bin/*Contract*.nupkg --api-key $NUGETAPIKEY --source musk --skip-duplicate
    depends_on:
@ -411,8 +404,7 @@ steps:
        from_secret: nuget_musk_api_key
    commands:
      - cd flea
-      - mkdir -p /root/.nuget/NuGet
-      - cp nuget.config /root/.nuget/NuGet/NuGet.Config
+      - dotnet nuget add source --name musk https://gitea.musk.fun/api/packages/nocr/nuget/index.json
      - dotnet pack users/Nocr.Users.sln -o ./bin -p:PackageVersion=${DRONE_TAG}
      - dotnet nuget push ./bin/*Contract*.nupkg --api-key $NUGETAPIKEY --source musk --skip-duplicate
    depends_on:
@ -433,9 +425,7 @@ steps:
    commands:
      - mkdir -p /kaniko/.docker
      - echo "{\"auths\":{\"hub.musk.fun\":{\"username\":\"$HUB_USERNAME\",\"password\":\"$HUB_PASSWORD\"}}}" > /kaniko/.docker/config.json
-      - cd flea
-      - cp nuget.config telegram-listener/
-      - cd telegram-listener
+      - cd flea/telegram-listener
      - |
        /kaniko/executor \
          --context=. \
@ -459,9 +449,7 @@ steps:
    commands:
      - mkdir -p /kaniko/.docker
      - echo "{\"auths\":{\"hub.musk.fun\":{\"username\":\"$HUB_USERNAME\",\"password\":\"$HUB_PASSWORD\"}}}" > /kaniko/.docker/config.json
-      - cd flea
-      - cp nuget.config telegram-client/
-      - cd telegram-client
+      - cd flea/telegram-client
      - |
        /kaniko/executor \
          --context=. \
@ -485,9 +473,7 @@ steps:
    commands:
      - mkdir -p /kaniko/.docker
      - echo "{\"auths\":{\"hub.musk.fun\":{\"username\":\"$HUB_USERNAME\",\"password\":\"$HUB_PASSWORD\"}}}" > /kaniko/.docker/config.json
-      - cd flea
-      - cp nuget.config text-matcher/
-      - cd text-matcher
+      - cd flea/text-matcher
      - |
        /kaniko/executor \
          --context=. \
@ -511,9 +497,7 @@ steps:
    commands:
      - mkdir -p /kaniko/.docker
      - echo "{\"auths\":{\"hub.musk.fun\":{\"username\":\"$HUB_USERNAME\",\"password\":\"$HUB_PASSWORD\"}}}" > /kaniko/.docker/config.json
-      - cd flea
-      - cp nuget.config text-matcher/
-      - cd text-matcher
+      - cd flea/text-matcher
      - |
        /kaniko/executor \
          --context=. \
@ -537,9 +521,7 @@ steps:
    commands:
      - mkdir -p /kaniko/.docker
      - echo "{\"auths\":{\"hub.musk.fun\":{\"username\":\"$HUB_USERNAME\",\"password\":\"$HUB_PASSWORD\"}}}" > /kaniko/.docker/config.json
-      - cd flea
-      - cp nuget.config users/
-      - cd users
+      - cd flea/users
      - |
        /kaniko/executor \
          --context=. \
@ -563,9 +545,7 @@ steps:
    commands:
      - mkdir -p /kaniko/.docker
      - echo "{\"auths\":{\"hub.musk.fun\":{\"username\":\"$HUB_USERNAME\",\"password\":\"$HUB_PASSWORD\"}}}" > /kaniko/.docker/config.json
-      - cd flea
-      - cp nuget.config users/
-      - cd users
+      - cd flea/users
      - |
        /kaniko/executor \
          --context=. \
@ -585,15 +565,10 @@ steps:

  - name: deploy-to-k8s
    image: bitnami/kubectl:latest
-    environment:
-      KUBECONFIG_CONTENT:
-        from_secret: kubeconfig
    commands:
-      - mkdir -p $HOME/.kube
-      - echo "$KUBECONFIG_CONTENT" > $HOME/.kube/config
-      - chmod 600 $HOME/.kube/config
      - cd flea/_deploy/scripts
-      - sh deploy.sh "${DRONE_TAG}" "${DRONE_COMMIT_SHA:0:7}"
+      - chmod +x deploy.sh
+      - ./deploy.sh "${DRONE_TAG}" "${DRONE_COMMIT_SHA:0:7}"
    depends_on:
      - users-migrator-build-push
    when:
@ -650,14 +625,9 @@ steps:

  - name: deploy
    image: bitnami/kubectl:latest
-    environment:
-      KUBECONFIG_CONTENT:
-        from_secret: kubeconfig
    commands:
-      - mkdir -p $HOME/.kube
-      - echo "$KUBECONFIG_CONTENT" > $HOME/.kube/config
-      - chmod 600 $HOME/.kube/config
      - cd flea/_deploy/scripts
-      - sh deploy.sh "${DRONE_TAG}" "" "latest"
+      - chmod +x deploy.sh
+      - ./deploy.sh "${DRONE_TAG}" "${DRONE_COMMIT_SHA:0:7}"
    depends_on:
      - check-trigger
--- a/CLAUDE.md
+++ b/CLAUDE.md
@ -27,39 +27,28 @@ The services follow a message bus pattern using RabbitMQ for async communication
 **Note:** WTelegram sends both `UpdateNewChannelMessage` and `UpdateEditChannelMessage` for the same message. TelegramListener publishes separate events to avoid duplicate notifications downstream.

 Each service follows Clean Architecture with separate projects for:
- **Host** (API/entry point) - ASP.NET Core application, controllers, startup configuration
- **AppServices** (business logic) - Use cases, business logic, command/query handlers
- **Core** (shared utilities) - Domain entities, interfaces, shared logic
- **Api.Contracts** (REST API contracts) - DTOs, request/response models for REST endpoints (published as NuGet)
- **Async.Api.Contracts** (event contracts) - Event DTOs for RabbitMQ messaging (published as NuGet)
- **Persistence** (database layer) - EF Core DbContext, repositories, data access (text-matcher, users only)
- **Migrator** (database migrations) - EF Core migrations, migration scripts (text-matcher, users only)
-
-**Project Structure Examples:**
- telegram-listener: Host, AppServices, Core, Async.Api.Contracts (no database)
- telegram-client: Host, AppServices, Core (no database, no published contracts)
- text-matcher: Host, AppServices, Core, Api.Contracts, Async.Api.Contracts, Persistence, Migrator
- users: Host, AppServices, Core, Api.Contracts, Persistence, Migrator
+- Host (API/entry point)
+- AppServices (business logic)
+- Core (shared utilities)
+- Api.Contracts (REST API contracts)
+- Async.Api.Contracts (event contracts)
+- Persistence (database layer, where applicable)
+- Migrator (database migrations, where applicable)

 ## Development Commands

 ### Running the System
 ```bash
-# IMPORTANT: Before building with Docker Compose, prepare the build environment
-./prepare-build.sh
-
 # Start all services with Docker Compose
 docker-compose up

-# Start individual services for development (no preparation needed)
+# Start individual services for development
 cd telegram-client && dotnet run --project src/Nocr.TelegramClient.Host
-cd telegram-listener && dotnet run --project src/Nocr.TelegramListener.Host
+cd telegram-listener && dotnet run --project src/Nocr.TelegramListener.Host  
 cd text-matcher && dotnet run --project src/Nocr.TextMatcher.Host
 cd users && dotnet run --project src/Nocr.Users.Host
 ```

-**Note:** The `prepare-build.sh` script copies `nuget.config` to all submodule roots, which is required for Docker builds. This step is automatic in CI/CD but must be run manually for local Docker Compose builds.
-
 ### Building
 ```bash
 # Build individual services
@ -71,17 +60,8 @@ dotnet build src/Nocr.<ServiceName>.Host

 ### Testing
 ```bash
-# Run all tests in text-matcher
+# Run unit tests (only text-matcher has tests currently)
 cd text-matcher && dotnet test
-
-# Run tests for a specific project
-cd text-matcher && dotnet test tests/Nocr.TextMatcher.AppServices.UnitTests/Nocr.TextMatcher.AppServices.UnitTests.csproj
-
-# Run tests with verbose output
-cd text-matcher && dotnet test --verbosity detailed
-
-# Run tests with code coverage (if configured)
-cd text-matcher && dotnet test --collect:"XPlat Code Coverage"
 ```

 ### Database Migrations
@ -95,29 +75,6 @@ cd users && ./src/Nocr.Users.Migrator/AddMigration.sh MyMigrationName
 # Apply migrations (handled automatically by migrator containers in docker-compose)
 ```

-### Working with Git Submodules
-
-```bash
-# Initialize submodules after cloning the repository
-git submodule update --init --recursive
-
-# Update all submodules to their latest commits on main
-./update-submodules.sh
-
-# Commit and push changes to all submodules at once
-./commit-all.sh "Your commit message"
-
-# Update a single submodule
-cd telegram-listener
-git pull origin main
-cd ..
-git add telegram-listener
-git commit -m "Update telegram-listener submodule"
-
-# Check status of all submodules
-git submodule status
-```
-
 ## Configuration

 **📖 See [CONFIGURATION.md](CONFIGURATION.md) for detailed configuration guide.**
@ -176,47 +133,13 @@ When running with docker-compose:

 ## Key Technologies

- **.NET 8** - All services built on .NET 8
- **ASP.NET Core Web APIs** - REST endpoints and hosting
- **Entity Framework Core with MariaDB** - ORM for text-matcher and users databases
- **WTelegramClient** - MTProto API client for telegram-listener
- **Telegram.Bot** - Bot API client for telegram-client
- **Rebus** - Message bus abstraction over RabbitMQ
- **RabbitMQ** - Message broker for async event-driven communication
- **Docker & Docker Compose** - Local development and containerization
- **Kaniko** - Container image building in CI/CD
- **Drone CI** - CI/CD pipeline on Kubernetes
-
-## NuGet Package Management
-
-The project uses **Central Package Management (CPM)** with **Package Source Mapping** to manage NuGet dependencies:
-
-### Package Sources
-
- **nuget.org**: All public packages (Microsoft.*, Serilog.*, etc.)
- **musk** (private): Internal `Nocr.*` contract packages
-
-### Configuration
-
-The `nuget.config` file in the project root defines package source mapping:
-```xml
-<packageSourceMapping>
-  <packageSource key="musk">
-    <package pattern="Nocr.*" />
-  </packageSource>
-  <packageSource key="nuget.org">
-    <package pattern="*" />
-  </packageSource>
-</packageSourceMapping>
-```
-
-### How It Works
-
-1. **Local Development**: Copy `nuget.config` to each submodule root when needed
-2. **CI/CD**: Drone automatically copies `nuget.config` to `/root/.nuget/NuGet/NuGet.Config`
-3. **Docker Builds**: Kaniko copies `nuget.config` to submodule root before building
-
-This eliminates NuGet warning NU1507 and ensures consistent package resolution across all environments.
+- .NET 8
+- ASP.NET Core Web APIs
+- Entity Framework Core with MariaDB
+- WTelegramClient for Telegram API
+- Rebus for message bus (RabbitMQ)
+- Docker & Docker Compose for containerization
+- Drone CI/CD on Kubernetes

 ## CI/CD Pipeline

@ -225,240 +148,39 @@ This eliminates NuGet warning NU1507 and ensures consistent package resolution a
 The project uses Drone CI with 5 specialized pipelines:

 ### 1. Feature Validation (`feature/*`, `fix/*` branches)
-**Purpose**: Test feature branches before merging to main
-
-**How to trigger**:
-```bash
-# Create feature branch and push
-git checkout -b feature/my-new-feature
-# ... make changes ...
-git add .
-git commit -m "Add new feature"
-git push origin feature/my-new-feature
-```
-
-**What happens**:
+- Triggered on push to feature/fix branches
 - Runs build + tests with Testcontainers support
 - Provides fast feedback before merge
 - Duration: ~3-5 minutes

 ### 2. Main Validation (`main` branch)
-**Purpose**: Ensure main branch stays healthy after merge
-
-**How to trigger**:
-```bash
-# Merge feature to main
-git checkout main
-git merge feature/my-new-feature
-git push origin main
-```
-
-**What happens**:
+- Triggered on push to main
 - Same checks as feature validation
- Ensures main branch builds and tests pass
+- Ensures main branch stays healthy
 - Duration: ~3-5 minutes

-### 3. Contracts-Only Publish
-**Purpose**: Publish NuGet contracts without building Docker images (fast iteration)
-
-**How to trigger**:
-```bash
-# Update contracts in a submodule
-cd telegram-listener
-# ... update Async.Api.Contracts ...
-git add . && git commit -m "Add MessageEdited event"
-git push
-
-# From parent repo, tag with contracts_only marker
-cd ..
-git add telegram-listener
-git commit -m "contracts_only:telegram_listener - Add MessageEdited event"
-git tag 0.7.41
-git push && git push --tags
-```
-
-**What happens**:
- Publishes only the specified service's NuGet contracts
- Skips Docker image builds
+### 3. Contracts-Only Publish (tags with `contracts_only:`)
+- Triggered by tag + commit message containing `contracts_only:<service>`
+- Publishes NuGet contracts without building Docker images
+- Fast iteration on contract changes
 - Duration: ~2 minutes
+- Example: `git commit -m "contracts_only:telegram_listener - Add MessageEdited event"`

-**Services**: `telegram_listener`, `text_matcher`, `users`
-
-### 4. Full Release
-**Purpose**: Complete release - contracts + images + deployment
-
-**How to trigger**:
-```bash
-# Make your changes, commit to main
-git add .
-git commit -m "Implement new feature"
-git push
-
-# Tag for full release (no special markers in commit message)
-git tag v1.3.0
-git push --tags
-```
-
-**What happens**:
-1. Publishes all NuGet contracts (parallel)
-2. Builds all Docker images with Kaniko (parallel, after contracts)
-3. Deploys to Kubernetes (automatic for `v*` tags)
+### 4. Full Release (clean tags)
+- Triggered by tag without special markers
+- Complete release cycle:
+  1. Publish all NuGet contracts (parallel)
+  2. Build all Docker images with Kaniko (parallel, after contracts)
+  3. Deploy to Kubernetes (automatic for `v*` tags)
 - Duration: ~8-10 minutes
+- Example: `git tag v1.3.0`

-### 5. Deploy-Only
-**Purpose**: Deploy existing images without rebuilding (rollbacks, hotfixes)
-
-**How to trigger**:
-```bash
-# Deploy already-built images (e.g., rollback to previous version)
-git commit --allow-empty -m "deploy_only: Rollback to v1.2.9"
-git tag deploy-v1.2.9
-git push && git push --tags
-
-# Or deploy latest images
-git commit --allow-empty -m "deploy_only: Deploy latest"
-git tag deploy-latest
-git push && git push --tags
-```
-
-**What happens**:
- Skips building entirely
- Deploys specified tag's images (or `latest`)
+### 5. Deploy-Only (tags with `deploy_only:`)
+- Triggered by tag + commit message containing `deploy_only:`
+- Skips building, only deploys existing images
+- Useful for rollbacks and hotfixes
 - Duration: ~1 minute
-
-## Development Workflows
-
-### Making Changes to a Single Service
-
-When working on a specific service (e.g., telegram-listener):
-
-```bash
-# 1. Navigate to the submodule
-cd telegram-listener
-
-# 2. Create a feature branch in the submodule
-git checkout -b feature/new-feature
-
-# 3. Make your changes to the code
-# ... edit files ...
-
-# 4. Test locally (if tests exist)
-dotnet test
-
-# 5. Commit and push in the submodule
-git add .
-git commit -m "Add new feature"
-git push origin feature/new-feature
-
-# 6. Return to parent repo and update submodule reference
-cd ..
-git add telegram-listener
-git commit -m "Update telegram-listener: Add new feature"
-git push origin main
-```
-
-### Updating Contract Packages
-
-When you change event contracts (Async.Api.Contracts) or REST contracts (Api.Contracts):
-
-```bash
-# 1. Make changes to contracts in the submodule
-cd text-matcher
-# ... edit Nocr.TextMatcher.Async.Api.Contracts ...
-git add . && git commit -m "Add new event contract"
-git push origin main
-
-# 2. Return to parent repo and publish contracts only
-cd ..
-git add text-matcher
-git commit -m "contracts_only:text_matcher - Add new event contract"
-git tag 0.8.6
-git push && git push --tags
-
-# 3. Other services can now reference the new contract version
-# Update their .csproj or Directory.Packages.props to use version 0.8.6
-```
-
-### Working Across Multiple Services
-
-When implementing a feature that spans multiple services:
-
-```bash
-# 1. Update each submodule in sequence
-cd telegram-listener
-git checkout -b feature/cross-service-feature
-# ... make changes ...
-git commit -m "Part 1: Update listener"
-git push origin feature/cross-service-feature
-
-cd ../text-matcher
-git checkout -b feature/cross-service-feature
-# ... make changes ...
-git commit -m "Part 2: Update matcher"
-git push origin feature/cross-service-feature
-
-# 2. Update parent repo to reference all changes
-cd ..
-git add telegram-listener text-matcher
-git commit -m "Implement cross-service feature"
-git push origin main
-
-# 3. Tag for full release
-git tag v1.5.0
-git push --tags
-```
-
-## Common CI/CD Workflows
-
-### Test a Feature Branch
-```bash
-git checkout -b feature/add-logging
-# ... make changes ...
-git add . && git commit -m "Add structured logging"
-git push origin feature/add-logging
-# ✅ Drone runs feature-validation pipeline
-```
-
-### Publish Contracts After API Changes
-```bash
-cd text-matcher
-# Update Nocr.TextMatcher.Async.Api.Contracts
-git add . && git commit -m "Add UserDeleted event"
-git push
-
-cd ..
-git add text-matcher
-git commit -m "contracts_only:text_matcher - Add UserDeleted event"
-git tag 0.8.5
-git push && git push --tags
-# ✅ Drone publishes text-matcher contracts to NuGet
-```
-
-### Full Release Workflow
-```bash
-# Work on main branch
-git add .
-git commit -m "Implement payment processing"
-git push
-# ✅ Drone runs main-validation
-
-# Tag for release
-git tag v2.0.0
-git push --tags
-# ✅ Drone runs full-release pipeline:
-#    1. Publishes all contracts
-#    2. Builds all Docker images
-#    3. Deploys to Kubernetes
-```
-
-### Emergency Rollback
-```bash
-# Rollback to last known good version
-git commit --allow-empty -m "deploy_only: Emergency rollback to v1.9.5"
-git tag rollback-v1.9.5
-git push && git push --tags
-# ✅ Drone deploys v1.9.5 images immediately (~1 minute)
-```
+- Example: `git commit --allow-empty -m "deploy_only: Deploy v1.2.9"`

 ### Deployment Scripts

@ -473,83 +195,4 @@ Located in `_deploy/scripts/`:
 - **Parallel execution** for independent operations
 - **Proper dependency order**: Contracts → Images → Deploy
 - **Kaniko layer caching** for faster Docker builds
- **Docker-in-Docker** support for Testcontainers in tests
-
-## Troubleshooting
-
-### Submodule Issues
-
-**Problem:** Submodule directories are empty after cloning
-```bash
-# Solution: Initialize submodules
-git submodule update --init --recursive
-```
-
-**Problem:** Submodule is in detached HEAD state
-```bash
-# Solution: Check out the main branch in the submodule
-cd <submodule-name>
-git checkout main
-git pull origin main
-cd ..
-```
-
-**Problem:** Changes in submodule not reflected in parent repo
-```bash
-# Solution: Update submodule reference in parent
-cd ..  # Return to parent repo
-git add <submodule-name>
-git commit -m "Update <submodule-name> reference"
-```
-
-### Build Issues
-
-**Problem:** NuGet package restore fails with NU1507 warning
-```bash
-# Solution: Copy nuget.config to submodule root
-cp nuget.config telegram-listener/
-cd telegram-listener && dotnet restore
-```
-
-**Problem:** Cannot find Nocr.* contract packages
-```bash
-# Solution: Ensure you have access to the private NuGet feed
-# Check nuget.config has the correct source configuration
-# Verify credentials for the "musk" package source
-```
-
-### Docker Compose Issues
-
-**Problem:** Service cannot connect to RabbitMQ
-```bash
-# Solution: Use the Docker network hostname, not localhost
-# In docker-compose environment: nocr-rabbitmq:5672
-# In local development: localhost:5672
-```
-
-**Problem:** Database connection fails
-```bash
-# Solution: Wait for database health checks to pass
-# Check docker-compose logs for database container
-docker-compose logs nocr-text-matcher-db
-# Database takes 10-30 seconds to be ready on first start
-```
-
-### CI/CD Issues
-
-**Problem:** Pipeline doesn't trigger on tag
-```bash
-# Solution: Ensure tag matches expected patterns
-# Feature validation: feature/*, fix/*, issues/*
-# Main validation: main branch
-# Contracts: Tag with commit message containing "contracts_only:<service>"
-# Full release: Any tag without special markers
-# Deploy-only: Tag with commit message containing "deploy_only:"
-```
-
-**Problem:** Docker image build fails in Kaniko
-```bash
-# Solution: Check if nuget.config is correctly copied
-# Verify _deploy/deploy.sh contains nuget.config copy step
-# Check Drone logs for nuget.config presence in build context
-```
+- **Docker-in-Docker** support for Testcontainers in tests
--- a/_deploy/README.md
+++ b/_deploy/README.md
@ -110,7 +110,7 @@ git push origin v1.3.0
 ---

 ### Пайплайн 5: **Deploy-Only (Только деплой)**
-**Триггер:** Тег с сообщением коммита, содержащим `deploy_only: <version>`
+**Триггер:** Тег с сообщением коммита, содержащим `deploy_only:`
 **Назначение:** Быстрый деплой уже собранных образов
 **Длительность:** ~1 минута

@ -119,26 +119,14 @@ git push origin v1.3.0
 - Деплоит указанные образы в Kubernetes
 - Полезно для отката или продвижения существующих образов

-**ВАЖНО:** В сообщении коммита нужно указать версию образов для деплоя:
-
 **Пример рабочего процесса:**
 ```bash
-# Деплой существующих образов v1.2.9
-git commit --allow-empty -m "deploy_only: v1.2.9"
-git tag deploy-v1.2.9
-git push origin deploy-v1.2.9
-
-# Откат на предыдущую версию v1.2.8
-git commit --allow-empty -m "deploy_only: v1.2.8"
-git tag rollback-v1.2.8
-git push origin rollback-v1.2.8
+# Деплой существующих образов
+git commit --allow-empty -m "deploy_only: Deploy v1.2.9"
+git tag v1.2.9-deploy
+git push origin v1.2.9-deploy
 ```

-**Формат commit message:**
- `deploy_only: v1.2.9` - деплоит образы с тегом `v1.2.9`
- Скрипт извлекает версию из сообщения и использует соответствующие образы
- Образы должны существовать в registry (собраны ранее через full-release)
-
 ---

 ## 🛠️ Скрипты деплоя
@ -149,18 +137,10 @@ git push origin rollback-v1.2.8
 **Назначение:** Деплой сервисов в Kubernetes
 **Использование:**
 ```bash
-# Full release (использует TAG для образов)
+./deploy.sh <tag> <commit-sha>
 ./deploy.sh v1.3.0 abc1234
-
-# Deploy only (переопределяет тег образа)
-./deploy.sh deploy-v1.2.9 def5678 v1.2.9
 ```

-**Параметры:**
-1. `tag` - Git тег (обязательный)
-2. `commit-sha` - SHA коммита (опциональный)
-3. `image-tag-override` - Переопределение тега образа (опциональный, для deploy_only)
-
 **Возможности:**
 - Обновляет deployment-манифесты новыми тегами образов
 - Применяет манифесты в кластер
@ -276,9 +256,9 @@ Push в main → Main Validation (сборка + тесты)
 4. **Экстренный откат**
   ```bash
   # Быстрый откат через deploy-only
-   git commit --allow-empty -m "deploy_only: v1.2.8"
-   git tag rollback-v1.2.8
-   git push origin rollback-v1.2.8
+   git commit --allow-empty -m "deploy_only: Rollback to v1.2.8"
+   git tag v1.2.8-rollback
+   git push origin v1.2.8-rollback

   # Или используйте скрипт отката напрямую в кластере
   kubectl exec -it deploy-pod -- bash
--- a/_deploy/scripts/deploy.sh
+++ b/_deploy/scripts/deploy.sh
@ -4,34 +4,20 @@ set -e
 # ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 # 🚀 Nocr Services Deployment Script
 # ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-# Usage: ./deploy.sh <tag> [commit-sha] [image-tag-override]
-# Examples:
-#   Full release:  ./deploy.sh v1.2.3 abc1234
-#   Deploy only:   ./deploy.sh deploy-v1.2.3 def5678 v1.2.3
+# Usage: ./deploy.sh <tag> <commit-sha>
+# Example: ./deploy.sh v1.2.3 abc1234
 # ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

 TAG=${1:-latest}
-COMMIT_SHA=${2:-}
+COMMIT_SHA=${2:-latest}
 NAMESPACE="nocr"
 DEPLOYMENT_FILE="../k8s/deployment.yaml"
-IMAGE_TAG_OVERRIDE=${3:-}
-
-# Determine image tag to use
-# Priority: 1) IMAGE_TAG_OVERRIDE (from command line), 2) TAG
-if [ -n "$IMAGE_TAG_OVERRIDE" ]; then
-  IMAGE_TAG=$IMAGE_TAG_OVERRIDE
-else
-  IMAGE_TAG=${TAG}
-fi

 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo "🚀 Starting deployment of Nocr services"
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo "📦 Tag: $TAG"
-echo "🏷️  Image Tag: $IMAGE_TAG"
-if [ -n "$COMMIT_SHA" ]; then
-  echo "📝 Commit SHA: $COMMIT_SHA"
-fi
+echo "📝 Commit SHA: $COMMIT_SHA"
 echo "🎯 Namespace: $NAMESPACE"
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"

@ -56,12 +42,12 @@ cp "$DEPLOYMENT_FILE" "$TEMP_DEPLOYMENT"
 echo "🔧 Updating image tags in deployment manifests..."

 # Update image tags for all services
-sed -i "s|hub.musk.fun/k8s/nocr/telegram_listener:.*|hub.musk.fun/k8s/nocr/telegram_listener:${IMAGE_TAG}|g" "$TEMP_DEPLOYMENT"
-sed -i "s|hub.musk.fun/k8s/nocr/telegram_client:.*|hub.musk.fun/k8s/nocr/telegram_client:${IMAGE_TAG}|g" "$TEMP_DEPLOYMENT"
-sed -i "s|hub.musk.fun/k8s/nocr/text_matcher:.*|hub.musk.fun/k8s/nocr/text_matcher:${IMAGE_TAG}|g" "$TEMP_DEPLOYMENT"
-sed -i "s|hub.musk.fun/k8s/nocr/text_matcher_migrator:.*|hub.musk.fun/k8s/nocr/text_matcher_migrator:${IMAGE_TAG}|g" "$TEMP_DEPLOYMENT"
-sed -i "s|hub.musk.fun/k8s/nocr/users:.*|hub.musk.fun/k8s/nocr/users:${IMAGE_TAG}|g" "$TEMP_DEPLOYMENT"
-sed -i "s|hub.musk.fun/k8s/nocr/users_migrator:.*|hub.musk.fun/k8s/nocr/users_migrator:${IMAGE_TAG}|g" "$TEMP_DEPLOYMENT"
+sed -i "s|hub.musk.fun/k8s/nocr/telegram_listener:.*|hub.musk.fun/k8s/nocr/telegram_listener:${COMMIT_SHA}|g" "$TEMP_DEPLOYMENT"
+sed -i "s|hub.musk.fun/k8s/nocr/telegram_client:.*|hub.musk.fun/k8s/nocr/telegram_client:${COMMIT_SHA}|g" "$TEMP_DEPLOYMENT"
+sed -i "s|hub.musk.fun/k8s/nocr/text_matcher:.*|hub.musk.fun/k8s/nocr/text_matcher:${COMMIT_SHA}|g" "$TEMP_DEPLOYMENT"
+sed -i "s|hub.musk.fun/k8s/nocr/text_matcher_migrator:.*|hub.musk.fun/k8s/nocr/text_matcher_migrator:${COMMIT_SHA}|g" "$TEMP_DEPLOYMENT"
+sed -i "s|hub.musk.fun/k8s/nocr/users:.*|hub.musk.fun/k8s/nocr/users:${COMMIT_SHA}|g" "$TEMP_DEPLOYMENT"
+sed -i "s|hub.musk.fun/k8s/nocr/users_migrator:.*|hub.musk.fun/k8s/nocr/users_migrator:${COMMIT_SHA}|g" "$TEMP_DEPLOYMENT"

 echo "✅ Image tags updated"

@ -74,18 +60,11 @@ rm "$TEMP_DEPLOYMENT"

 echo "✅ Manifests applied"
 echo ""
-
-# Force restart deployments to pull latest images
-echo "🔄 Restarting deployments to pull new images..."
-DEPLOYMENTS=("telegram-listener" "text-matcher" "users" "telegram-client")
-for deployment in "${DEPLOYMENTS[@]}"; do
-    kubectl rollout restart deployment/"$deployment" -n "$NAMESPACE"
-    echo "  ↻ Restarted $deployment"
-done
-echo ""
-
 echo "⏳ Waiting for rollouts to complete..."
 echo ""
+
+# Wait for each deployment to roll out
+DEPLOYMENTS=("telegram-listener" "text-matcher" "users" "telegram-client")
 TIMEOUT="300s"

 for deployment in "${DEPLOYMENTS[@]}"; do
--- a/nuget.config
+++ b/nuget.config
@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="musk" value="https://gitea.musk.fun/api/packages/nocr/nuget/index.json" />
-  </packageSources>
-
-  <!-- Package Source Mapping for Central Package Management -->
-  <packageSourceMapping>
-    <!-- All Nocr.* packages come from the private 'musk' feed -->
-    <packageSource key="musk">
-      <package pattern="Nocr.*" />
-    </packageSource>
-
-    <!-- All other packages come from nuget.org -->
-    <packageSource key="nuget.org">
-      <package pattern="*" />
-    </packageSource>
-  </packageSourceMapping>
-</configuration>
--- a/prepare-build.sh
+++ b/prepare-build.sh
@ -1,16 +0,0 @@
-#!/bin/bash
-# Prepares the build environment by copying nuget.config to all submodules
-# This is required for both local docker-compose builds and CI/CD
-
-set -e
-
-echo "📦 Copying nuget.config to all submodules..."
-
-for submodule in telegram-client telegram-listener text-matcher users; do
-    if [ -d "$submodule" ]; then
-        cp nuget.config "$submodule/"
-        echo "✓ Copied to $submodule/"
-    fi
-done
-
-echo "✅ Build preparation complete!"
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e8ee01cbe809867305ff02611155cddffccbb401
+Subproject commit a4ed855d56ce9f4241034983e0bb43cab433d70d
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 9ad504753550414edd96ef4194a3e0ee7e604e28
+Subproject commit 758cb653d97bb8fce43145adc0e8075e24f82d06
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 1a55061e4b1b125d1b911f479fc830fb94cd93cc
+Subproject commit 1691de91b6991623494ab84afd29863b7cec3653
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 30ae0c043ca2f8958223d6fb343b8b3e3561d727
+Subproject commit fa136fc7a4efdbad3cf700f8e4ef2957929e022b