diff --git a/db/__init__.py b/db/__init__.py
index 1d12add..05ae996 100644
--- a/db/__init__.py
+++ b/db/__init__.py
@@ -1,5 +1,5 @@
-from db.database import init_db, get_db_connection
+from db.database import init_db, get_db_pool, close_db_pool
 from db.models import SourceChannel, TargetChannel, Post, Setting
 from db.repository import Repository
 
-__all__ = ["init_db", "get_db_connection", "SourceChannel", "TargetChannel", "Post", "Setting", "Repository"]
+__all__ = ["init_db", "get_db_pool", "close_db_pool", "SourceChannel", "TargetChannel", "Post", "Setting", "Repository"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 32f28f1..662a0fe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,21 +32,22 @@ services:
     env_file:
       - .env
     volumes:
-      - ./data:/app/data
-      - ./sessions:/app/sessions
+      - copykar_data:/app/data
+      - copykar_sessions:/app/sessions
 
   prometheus:
-    image: prom/prometheus:v2.54.1
+    build:
+      context: ./monitoring/prometheus
     container_name: copykar_prometheus
     restart: unless-stopped
     volumes:
-      - ./monitoring/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
       - prometheus_data:/prometheus
     ports:
       - "9090:9090"
 
   grafana:
-    image: grafana/grafana:11.2.0
+    build:
+      context: ./monitoring/grafana
     container_name: copykar_grafana
     restart: unless-stopped
     environment:
@@ -56,7 +57,6 @@ services:
     ports:
       - "3000:3000"
     volumes:
-      - ./monitoring/grafana/provisioning:/etc/grafana/provisioning
       - grafana_data:/var/lib/grafana
     depends_on:
       - prometheus
@@ -65,3 +65,5 @@ volumes:
   postgres_data:
   prometheus_data:
   grafana_data:
+  copykar_data:
+  copykar_sessions:
diff --git a/monitoring/grafana/Dockerfile b/monitoring/grafana/Dockerfile
new file mode 100644
index 0000000..8eac12f
--- /dev/null
+++ b/monitoring/grafana/Dockerfile
@@ -0,0 +1,2 @@
+FROM grafana/grafana:11.2.0
+COPY provisioning /etc/grafana/provisioning
diff --git a/monitoring/prometheus/Dockerfile b/monitoring/prometheus/Dockerfile
new file mode 100644
index 0000000..a0dc92c
--- /dev/null
+++ b/monitoring/prometheus/Dockerfile
@@ -0,0 +1,2 @@
+FROM prom/prometheus:v2.54.1
+COPY prometheus.yml /etc/prometheus/prometheus.yml