diff --git a/backend/cmd/blabber-hive/main.go b/backend/cmd/blabber-hive/main.go
index b309a4c..6197bc8 100644
--- a/backend/cmd/blabber-hive/main.go
+++ b/backend/cmd/blabber-hive/main.go
@@ -54,7 +54,7 @@ func main() {
 
 	kafkaProducer, err := kafka.KafkaProducer()
 	if err != nil {
-		log.Printf("Failed to initialize Kafka producer")
+		log.Fatalf("Failed to initialize Kafka producer: %s", err)
 	}
 	defer kafkaProducer.Close()
 
@@ -102,7 +102,7 @@ func main() {
 	defer batchProcessor.Stop()
 
 	if _, err := kafka.KafkaConsumer(batchProcessor); err != nil {
-		log.Printf("Failed to initialize Kafka consumer: %s", err)
+		log.Fatalf("Failed to initialize Kafka consumer: %s", err)
 	}
 
 	routerConfig := &router.RouterConfig{
diff --git a/k8s/kafka/broker-claim0-persistentvolumeclaim.yaml b/k8s/kafka/broker-claim0-persistentvolumeclaim.yaml
deleted file mode 100644
index c1c8c66..0000000
--- a/k8s/kafka/broker-claim0-persistentvolumeclaim.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  labels:
-    io.kompose.service: broker-claim0
-  name: broker-claim0
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 100Mi
diff --git a/k8s/kafka/broker-deployment.yaml b/k8s/kafka/broker-deployment.yaml
index 095eae2..df8f90e 100644
--- a/k8s/kafka/broker-deployment.yaml
+++ b/k8s/kafka/broker-deployment.yaml
@@ -40,6 +40,8 @@ spec:
               value: "1"
             - name: KAFKA_ZOOKEEPER_CONNECT
               value: zookeeper:2181
+            - name: KAFKA_LOG4J_ROOT_LOGLEVEL
+              value: DEBUG
           image: confluentinc/cp-kafka:7.4.3
           name: blabber-hive-broker
           ports:
@@ -47,10 +49,10 @@ spec:
               hostPort: 9092
               protocol: TCP
           volumeMounts:
-            - mountPath: /wait-for-it.sh
-              name: broker-claim0
+            - mountPath: /var/lib/kafka
+              name: kafka-data
       restartPolicy: Always
       volumes:
-        - name: broker-claim0
+        - name: kafka-data
           persistentVolumeClaim:
-            claimName: broker-claim0
+            claimName: kafka-data-pvc
diff --git a/k8s/kafka/broker-pv.yaml b/k8s/kafka/broker-pv.yaml
new file mode 100644
index 0000000..826c744
--- /dev/null
+++ b/k8s/kafka/broker-pv.yaml
@@ -0,0 +1,28 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: kafka-broker-pv
+spec:
+  capacity:
+    storage: 1Gi # Adjust the storage size as needed
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: hostpath
+  hostPath:
+    path: /media/mint/linux-1/k8s/kafka # Adjust the path to match your Kafka data directory on the host
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  labels:
+    io.kompose.service: broker
+  name: kafka-data-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
+  volumeName: kafka-broker-pv
+  storageClassName: hostpath
diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml
index eab940a..8a05ced 100644
--- a/k8s/kustomization.yaml
+++ b/k8s/kustomization.yaml
@@ -6,7 +6,7 @@ resources:
   - fastapi/fastapi-service.yaml
   - grafana/grafana-deployment.yaml
   - grafana/grafana-service.yaml
-  - kafka/broker-claim0-persistentvolumeclaim.yaml
+  - kafka/broker-pv.yaml
   - kafka/broker-deployment.yaml
   - kafka/broker-service.yaml
   #- kafka/broker-jobs.yaml
@@ -15,6 +15,7 @@ resources:
   - nginx/nginx-deployment.yaml
   - nginx/nginx-service.yaml
   - postgres/postgres-service.yaml
+  - postgres/postgres-pv.yaml
   - postgres/postgres-env-docker-configmap.yaml
   - prometheus/prometheus-cm0-configmap.yaml
   - prometheus/prometheus-deployment.yaml
diff --git a/k8s/postgres/postgres-pv.yaml b/k8s/postgres/postgres-pv.yaml
new file mode 100644
index 0000000..dab16d3
--- /dev/null
+++ b/k8s/postgres/postgres-pv.yaml
@@ -0,0 +1,14 @@
+# PersistentVolume for Postgres
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: postgres-pv
+spec:
+  capacity:
+    storage: 20Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: hostpath
+  hostPath:
+    path: /media/mint/linux-1/k8s/postgres
diff --git a/k8s/postgres/postgres-service.yaml b/k8s/postgres/postgres-service.yaml
index 27332d5..64e3716 100644
--- a/k8s/postgres/postgres-service.yaml
+++ b/k8s/postgres/postgres-service.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: Service
 metadata:
@@ -133,7 +132,12 @@ spec:
           volumeMounts:
             - name: postgres-data
               mountPath: /var/lib/postgresql/data
-      volumes:
-        - name: postgres-data
-          hostPath:
-            path: /home/geonhyuk/Documents/CS/Projects/blabber-hive/database
+  volumeClaimTemplates:
+    - metadata:
+        name: postgres-data
+      spec:
+        accessModes: ["ReadWriteOnce"]
+        resources:
+          requests:
+            storage: 20Gi
+        storageClassName: hostpath