diff --git a/solution/compose.yaml b/solution/compose.yaml
index ced37b1..2b8138c 100644
--- a/solution/compose.yaml
+++ b/solution/compose.yaml
@@ -112,20 +112,6 @@ services:
       start_interval: 2s
     restart: unless-stopped
 
-  celery-exporter:
-    image: docker.io/danihodovic/celery-exporter:0.11.1
-    depends_on:
-      redis:
-        restart: false
-        condition: service_healthy
-        required: true
-    env_file:
-      - path: ./infrastructure/celery-exporter/.env.template
-        required: true
-      - path: ./infrastructure/celery-exporter/.env
-        required: false
-    restart: unless-stopped
-
   telegram_bot:
     build:
       context: ./services/telegram_bot
@@ -173,21 +159,6 @@ services:
         source: redis_data
         target: /data
 
-  redis-exporter:
-    image: docker.io/oliver006/redis_exporter:v1.67.0-alpine
-    depends_on:
-      redis:
-        restart: false
-        condition: service_healthy
-        required: true
-    env_file:
-      - path: ./infrastructure/redis-exporter/.env.template
-        required: true
-      - path: ./infrastructure/redis-exporter/.env
-        required: false
-    restart: unless-stopped
-    shm_size: 4mb
-
   postgres:
     image: docker.io/postgres:17-alpine3.21
     configs:
@@ -216,21 +187,6 @@ services:
         source: postgres_data
         target: /var/lib/postgresql/data
 
-  postgres-exporter:
-    image: quay.io/prometheuscommunity/postgres-exporter:v0.16.0
-    depends_on:
-      postgres:
-        restart: false
-        condition: service_healthy
-        required: true
-    env_file:
-      - path: ./infrastructure/postgres-exporter/.env.template
-        required: true
-      - path: ./infrastructure/postgres-exporter/.env
-        required: false
-    restart: unless-stopped
-    shm_size: 4mb
-
   pgadmin:
     image: docker.io/dpage/pgadmin4:9
     configs:
@@ -301,33 +257,6 @@ services:
         source: ./infrastructure/grafana/scripts
         target: /etc/grafana/scripts
 
-  prometheus:
-    image: docker.io/prom/prometheus:v3.1.0
-    command:
-      - "--config.file=/etc/prometheus/prometheus.yaml"
-    configs:
-      - source: prometheus_config
-        target: /etc/prometheus/prometheus.yaml
-    healthcheck:
-      test: ["CMD", "wget", "-O", "-", "http://localhost:9090/-/healthy"]
-      interval: 1m30s
-      timeout: 5s
-      start_period: 5s
-      start_interval: 2s
-      retries: 5
-    ports:
-      - name: web
-        target: 9090
-        published: 13244
-        host_ip: 127.0.0.1
-        protocol: tcp
-    restart: unless-stopped
-    shm_size: 4mb
-    volumes:
-      - type: volume
-        source: prometheus_data
-        target: /prometheus
-
   minio:
     command: server --console-address ":9001"
     image: docker.io/minio/minio:RELEASE.2025-02-03T21-03-04Z
@@ -346,12 +275,12 @@ services:
     ports:
       - name: api
         target: 9000
-        published: 13245
+        published: 13244
         host_ip: 127.0.0.1
         protocol: tcp
       - name: console
         target: 9001
-        published: 13246
+        published: 13245
         host_ip: 127.0.0.1
         protocol: tcp
     restart: unless-stopped
diff --git a/solution/infrastructure/celery-exporter/.env.template b/solution/infrastructure/celery-exporter/.env.template
deleted file mode 100644
index 0bc4e3e..0000000
--- a/solution/infrastructure/celery-exporter/.env.template
+++ /dev/null
@@ -1 +0,0 @@
-CE_BROKER_URL=redis://redis:6379
diff --git a/solution/infrastructure/postgres-exporter/.env.template b/solution/infrastructure/postgres-exporter/.env.template
deleted file mode 100644
index 9e72489..0000000
--- a/solution/infrastructure/postgres-exporter/.env.template
+++ /dev/null
@@ -1,3 +0,0 @@
-DATA_SOURCE_URI=postgres:5432/postgres?sslmode=disable
-DATA_SOURCE_USER=postgres
-DATA_SOURCE_PASS=postgres
diff --git a/solution/infrastructure/prometheus/prometheus.yaml b/solution/infrastructure/prometheus/prometheus.yaml
deleted file mode 100644
index 43a0c92..0000000
--- a/solution/infrastructure/prometheus/prometheus.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Global config
-global:
-  scrape_interval: 10s
-  scrape_timeout: 10s
-  evaluation_interval: 10m
-  external_labels:
-    environment: local
-    instance: somemachinelol
-
-scrape_configs:
-  # Prometheus
-  - job_name: prometheus
-    scrape_interval: 5s
-    static_configs:
-      - targets: ["localhost:9090"]
-
-  # Postgres
-  - job_name: postgres
-    scrape_interval: 10s
-    static_configs:
-      - targets: ["postgres-exporter:9187"]
-
-  # Redis
-  - job_name: redis
-    scrape_interval: 10s
-    static_configs:
-      - targets: ["redis-exporter:9121"]
-
-  # Celery
-  - job_name: celery
-    scrape_interval: 30s
-    static_configs:
-      - targets: ["celery-exporter:9808"]
diff --git a/solution/infrastructure/redis-exporter/.env.template b/solution/infrastructure/redis-exporter/.env.template
deleted file mode 100644
index d1fc912..0000000
--- a/solution/infrastructure/redis-exporter/.env.template
+++ /dev/null
@@ -1,2 +0,0 @@
-REDIS_ADDR=redis://redis:6379
-REDIS_EXPORTER_PING_ON_CONNECT=true
diff --git a/solution/tests/e2e/README.md b/solution/tests/e2e/README.md
index 2ac51a1..2be9fd7 100644
--- a/solution/tests/e2e/README.md
+++ b/solution/tests/e2e/README.md
@@ -11,7 +11,7 @@ Ensure you have the following installed on your system:
 
 ## Warning
 
-Plese note that containers will use ports 13241 to 13246 and 8080, so there is must be no listeners on this ports range.
+Plese note that containers will use ports 13241 to 13245 and 8080, so there is must be no listeners on this ports range.
 
 ## Install dependencies