diff --git a/Makefile b/Makefile
index c23aa38..8bcb3a0 100644
--- a/Makefile
+++ b/Makefile
@@ -39,10 +39,10 @@ migrate:
 	docker exec academy-master-backend python manage.py migrate
 
 local_confmap:
-	kubectl create configmap academy-master-env --from-env-file=./backend/.env.local && kubectl create configmap academy-master-env-file --from-file=.env=./backend/.env.local &&  kubectl create configmap postgres-initdb --from-file=./backend/docker/commands/pg-entrypoint.sh
+	kubectl create configmap academy-master-env --from-env-file=./backend/.env.local && kubectl create configmap academy-master-env-file --from-file=.env=./backend/.env.local &&  kubectl create configmap postgres-initdb --from-file=./backend/docker/commands/pg-entrypoint.sh && kubectl create configmap prometheus-config --from-file=prometheus.yml=./prometheus/config.yaml
 
 prod_confmap:
-	kubectl create configmap academy-master-env --from-env-file=./backend/.env.prod && kubectl create configmap academy-master-env-file --from-file=.env=./backend/.env.prod &&  kubectl create configmap postgres-initdb --from-file=./backend/docker/commands/pg-entrypoint.sh
+	kubectl create configmap academy-master-env --from-env-file=./backend/.env.prod && kubectl create configmap academy-master-env-file --from-file=.env=./backend/.env.prod &&  kubectl create configmap postgres-initdb --from-file=./backend/docker/commands/pg-entrypoint.sh && kubectl create configmap prometheus-config --from-file=prometheus.yml=./prometheus/config.yaml
 
 load_mock_data:
 	docker exec academy-master-backend python manage.py loaddata sample-db.json
\ No newline at end of file
diff --git a/kubernetes/noed_exporter.yaml b/kubernetes/noed_exporter.yaml
new file mode 100644
index 0000000..50300a2
--- /dev/null
+++ b/kubernetes/noed_exporter.yaml
@@ -0,0 +1,34 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: academy-master-node-exporter-dp
+  labels:
+    app: academy-master-node-exporter
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: academy-master-node-exporter
+  template:
+    metadata:
+      labels:
+        app: academy-master-node-exporter
+    spec:
+      containers:
+        - name: node-exporter
+          image: quay.io/prometheus/node-exporter:latest
+          ports:
+            - containerPort: 9100
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: node-exporter
+spec:
+  selector:
+    app: academy-master-node-exporter
+  ports:
+    - protocol: TCP
+      port: 9100
+      targetPort: 9100
diff --git a/kubernetes/prometheus.yaml b/kubernetes/prometheus.yaml
new file mode 100644
index 0000000..202d195
--- /dev/null
+++ b/kubernetes/prometheus.yaml
@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: academy-master-prometheus-dp
+  labels:
+    app: academy-master-prometheus
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: academy-master-prometheus
+  template:
+    metadata:
+      labels:
+        app: academy-master-prometheus
+    spec:
+      containers:
+        - name: prometheus
+          image: prom/prometheus
+          ports:
+            - containerPort: 9090
+          volumeMounts:
+            - name: prometheus-config
+              mountPath: /etc/prometheus/prometheus.yml
+              subPath: prometheus.yml
+      volumes:
+        - name: prometheus-config
+          configMap:
+            name: prometheus-config
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: prometheus
+spec:
+  selector:
+    app: academy-master-prometheus
+  ports:
+    - protocol: TCP
+      port: 9090
+      targetPort: 9090