diff --git a/docker-compose-with-grafana.yml b/docker-compose-with-grafana.yml
deleted file mode 100644
index 4151b82fd..000000000
--- a/docker-compose-with-grafana.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-services:
-  keep-frontend:
-    extends:
-      file: docker-compose.common.yml
-      service: keep-frontend-common
-    image: us-central1-docker.pkg.dev/keephq/keep/keep-ui
-    environment:
-      - AUTH_TYPE=NO_AUTH
-      - API_URL=http://keep-backend:8080
-    volumes:
-      - ./state:/state
-    depends_on:
-      - keep-backend
-
-  keep-backend:
-    extends:
-      file: docker-compose.common.yml
-      service: keep-backend-common
-    image: us-central1-docker.pkg.dev/keephq/keep/keep-api
-    environment:
-      - AUTH_TYPE=NO_AUTH
-      - PROMETHEUS_MULTIPROC_DIR=/tmp/prometheus
-    volumes:
-      - ./state:/state
-
-  keep-websocket-server:
-    extends:
-      file: docker-compose.common.yml
-      service: keep-websocket-server-common
-
-  grafana:
-    image: grafana/grafana:latest
-    ports:
-      - "3001:3000"
-    volumes:
-      - ./grafana:/var/lib/grafana
-      - ./grafana/provisioning:/etc/grafana/provisioning
-      - ./grafana/dashboards:/etc/grafana/dashboards
-    environment:
-      - GF_SECURITY_ADMIN_USER=admin
-      - GF_SECURITY_ADMIN_PASSWORD=admin
-      - GF_USERS_ALLOW_SIGN_UP=false
-    depends_on:
-      - prometheus
-
-  prometheus:
-    image: prom/prometheus:latest
-    ports:
-      - "9090:9090"
-    volumes:
-      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
-    command:
-      - "--config.file=/etc/prometheus/prometheus.yml"
-    depends_on:
-      - keep-backend
diff --git a/docker-compose.yml b/docker-compose.yml
index 68291e6b6..14b6001ad 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,3 +26,33 @@ services:
     extends:
       file: docker-compose.common.yml
       service: keep-websocket-server-common
+
+  grafana:
+    image: grafana/grafana:latest
+    profiles:
+      - grafana
+    ports:
+      - "3001:3000"
+    volumes:
+      - ./grafana:/var/lib/grafana
+      - ./grafana/provisioning:/etc/grafana/provisioning
+      - ./grafana/dashboards:/etc/grafana/dashboards
+    environment:
+      - GF_SECURITY_ADMIN_USER=admin
+      - GF_SECURITY_ADMIN_PASSWORD=admin
+      - GF_USERS_ALLOW_SIGN_UP=false
+    depends_on:
+      - prometheus
+
+  prometheus:
+    image: prom/prometheus:latest
+    profiles:
+      - grafana
+    ports:
+      - "9090:9090"
+    volumes:
+      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+    command:
+      - "--config.file=/etc/prometheus/prometheus.yml"
+    depends_on:
+      - keep-backend