diff --git a/manifests/contextservice.yaml b/manifests/contextservice.yaml
index 80d6c94f90c7ad400c07a6591bf733ec78990c77..b4ef9c9cb2bc44bdfd2b01bdb16f86a897e02604 100644
--- a/manifests/contextservice.yaml
+++ b/manifests/contextservice.yaml
@@ -28,17 +28,17 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      #- name: redis
-      #  image: redis:6.2
-      #  ports:
-      #  - containerPort: 6379
-      #  resources:
-      #    requests:
-      #      cpu: 100m
-      #      memory: 128Mi
-      #    limits:
-      #      cpu: 500m
-      #      memory: 1024Mi
+      - name: redis
+        image: redis:6.2
+        ports:
+        - containerPort: 6379
+        resources:
+          requests:
+            cpu: 100m
+            memory: 128Mi
+          limits:
+            cpu: 500m
+            memory: 1024Mi
       - name: server
         image: registry.gitlab.com/teraflow-h2020/controller/context:latest
         imagePullPolicy: Always
@@ -51,8 +51,8 @@ spec:
           value: "inmemory"
         - name: MB_BACKEND
           value: "inmemory"
-        #- name: REDIS_DATABASE_ID
-        #  value: "0"
+        - name: REDIS_DATABASE_ID
+          value: "0"
         - name: LOG_LEVEL
           value: "INFO"
         - name: POPULATE_FAKE_DATA
diff --git a/manifests/webuiservice.yaml b/manifests/webuiservice.yaml
index be400c6911a6ea69819825545852746190145333..7f70e837c4b6b979477a3a02db6e744b41387d73 100644
--- a/manifests/webuiservice.yaml
+++ b/manifests/webuiservice.yaml
@@ -60,43 +60,43 @@ spec:
           limits:
             cpu: 700m
             memory: 1024Mi
-#      - name: grafana
-#        image: grafana/grafana:8.5.11
-#        imagePullPolicy: IfNotPresent
-#        ports:
-#          - containerPort: 3000
-#            name: http-grafana
-#            protocol: TCP
-#        env:
-#        - name: GF_SERVER_ROOT_URL
-#          value: "http://0.0.0.0:3000/grafana/"
-#        - name: GF_SERVER_SERVE_FROM_SUB_PATH
-#          value: "true"
-#        readinessProbe:
-#          failureThreshold: 3
-#          httpGet:
-#            path: /robots.txt
-#            port: 3000
-#            scheme: HTTP
-#          initialDelaySeconds: 10
-#          periodSeconds: 30
-#          successThreshold: 1
-#          timeoutSeconds: 2
-#        livenessProbe:
-#          failureThreshold: 3
-#          initialDelaySeconds: 30
-#          periodSeconds: 10
-#          successThreshold: 1
-#          tcpSocket:
-#            port: 3000
-#          timeoutSeconds: 1
-#        resources:
-#          requests:
-#            cpu: 250m
-#            memory: 750Mi
-#          limits:
-#            cpu: 700m
-#            memory: 1024Mi
+      - name: grafana
+        image: grafana/grafana:8.5.11
+        imagePullPolicy: IfNotPresent
+        ports:
+          - containerPort: 3000
+            name: http-grafana
+            protocol: TCP
+        env:
+        - name: GF_SERVER_ROOT_URL
+          value: "http://0.0.0.0:3000/grafana/"
+        - name: GF_SERVER_SERVE_FROM_SUB_PATH
+          value: "true"
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /robots.txt
+            port: 3000
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 30
+          successThreshold: 1
+          timeoutSeconds: 2
+        livenessProbe:
+          failureThreshold: 3
+          initialDelaySeconds: 30
+          periodSeconds: 10
+          successThreshold: 1
+          tcpSocket:
+            port: 3000
+          timeoutSeconds: 1
+        resources:
+          requests:
+            cpu: 250m
+            memory: 750Mi
+          limits:
+            cpu: 700m
+            memory: 1024Mi
 ---
 apiVersion: v1
 kind: Service
@@ -110,6 +110,6 @@ spec:
   - name: webui
     port: 8004
     targetPort: 8004
-#  - name: grafana
-#    port: 3000
-#    targetPort: 3000
+  - name: grafana
+    port: 3000
+    targetPort: 3000