diff --git a/services/grafana/deploy.sh b/services/grafana/deploy.sh
index ee26a27..248907c 100755
--- a/services/grafana/deploy.sh
+++ b/services/grafana/deploy.sh
@@ -3,15 +3,24 @@
 port=8080
 
 helm repo add grafana https://grafana.github.io/helm-charts  # Add Grafana Helm chart
+helm repo add prometheus-community https://prometheus-community.github.io/helm-charts  # Add Prometheus Helm chart
 helm repo update
-kubectl create namespace loki
-helm upgrade --install --namespace loki logging grafana/loki -f $(dirname $0)/loki-values.yaml --set loki.auth_enabled=false --set loki.useTestSchema=true  # Install Loki
+
+kubectl create namespace monitoring
+helm upgrade --install --namespace monitoring loki grafana/loki -f $(dirname $0)/loki-values.yaml --set loki.auth_enabled=false --set loki.useTestSchema=true  # Install Loki
 # TODO: Stop using test schema
 # TODO (maybe): Use auth
-helm upgrade --install --namespace loki loki-grafana grafana/grafana -f $(dirname $0)/grafana-values.yaml  # Install Grafana
-sleep 10  # TODO: Wait for pods
-export POD_NAME=$(kubectl get pods --namespace loki -l "app.kubernetes.io/name=grafana,app.kubernetes.io/instance=loki-grafana" -o jsonpath="{.items[0].metadata.name}")
-kubectl --namespace loki wait --for=condition=ready pods/$POD_NAME --timeout=300s
-kubectl --namespace loki port-forward $POD_NAME $port:3000 &
+# helm upgrade --install --namespace monitoring loki-grafana grafana/grafana -f $(dirname $0)/grafana-values.yaml  # Install Grafana
+# sleep 10  # TODO: Wait for pods
+# export POD_NAME=$(kubectl get pods --namespace loki -l "app.kubernetes.io/name=grafana,app.kubernetes.io/instance=loki-grafana" -o jsonpath="{.items[0].metadata.name}")
+# kubectl --namespace loki wait --for=condition=ready pods/$POD_NAME --timeout=300s
+# kubectl --namespace loki port-forward $POD_NAME $port:3000 &
+
+# echo "Admin password:" $(kubectl get secret --namespace loki loki-grafana -o jsonpath="{.data.admin-password}" | base64 --decode ; echo)
 
-echo "Admin password:" $(kubectl get secret --namespace loki loki-grafana -o jsonpath="{.data.admin-password}" | base64 --decode ; echo)
+helm install kube-prometheus prometheus-community/kube-prometheus-stack --namespace monitoring -f $(dirname $0)/prometheus-config.yaml
+
+sleep 10  # TODO: Wait for pods
+POD_NAME=$(kubectl get pods --namespace monitoring -l "app.kubernetes.io/name=grafana" -o jsonpath="{.items[0].metadata.name}")
+kubectl --namespace monitoring wait --for=condition=ready pods/$POD_NAME --timeout=300s
+kubectl --namespace monitoring port-forward service/kube-prometheus-grafana $port:80 &
diff --git a/services/grafana/prometheus-config.yaml b/services/grafana/prometheus-config.yaml
new file mode 100644
index 0000000..4c6fa61
--- /dev/null
+++ b/services/grafana/prometheus-config.yaml
@@ -0,0 +1,12 @@
+grafana:
+  enabled: true
+  adminPassword: tosta-mista-789  # TODO: Change password
+
+  aditionalDataSources:
+    - name: Loki
+      type: loki
+      # basicAuth: true
+      # basicAuthUser: ni
+      # basicAuthPassword: pass  # TODO: Change password
+      url: http://logging-loki-gateway.loki.svc.cluster.local
+      isDefault: true