diff --git a/.vscode/settings.json b/.vscode/settings.json
index 6eb70f6..068925f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -15,5 +15,5 @@
   "torizon_app_root": "/home/torizon",
   "tcb.packageName": "__change__",
   "tcb.version": "3.8.1",
-  "project_version": "0.4.0"
+  "project_version": "0.4.1"
 }
diff --git a/browser/.vscode/settings.json b/browser/.vscode/settings.json
index 760c332..b438b21 100644
--- a/browser/.vscode/settings.json
+++ b/browser/.vscode/settings.json
@@ -15,5 +15,5 @@
 	"torizon_app_root": "/home/torizon",
 	"tcb.packageName": "TorizonOSBuildStatusBrowser",
 	"tcb.version": "3.8.1",
-	"docker_tag": "0.4.0"
+	"docker_tag": "0.4.1"
 }
\ No newline at end of file
diff --git a/browser/docker-compose.prod.yml b/browser/docker-compose.prod.yml
index dd0d007..f0ea600 100644
--- a/browser/docker-compose.prod.yml
+++ b/browser/docker-compose.prod.yml
@@ -1,4 +1,4 @@
 version: "3.9"
 services:
   torizon-os-build-status-browser:
-    image: leograba/torizon-os-build-status-browser:0.4.0
+    image: leograba/torizon-os-build-status-browser:0.4.1
diff --git a/dataAcquisition/.vscode/settings.json b/dataAcquisition/.vscode/settings.json
index f1efcf3..3719f95 100644
--- a/dataAcquisition/.vscode/settings.json
+++ b/dataAcquisition/.vscode/settings.json
@@ -15,5 +15,5 @@
 	"torizon_app_root": "/home/torizon",
 	"tcb.packageName": "TorizonOSBuildStatusDataAcquisition",
 	"tcb.version": "3.8.1",
-	"docker_tag": "0.4.0"
+	"docker_tag": "0.4.1"
 }
\ No newline at end of file
diff --git a/dataAcquisition/docker-compose.prod.yml b/dataAcquisition/docker-compose.prod.yml
index d5ba4d0..b6a6b89 100644
--- a/dataAcquisition/docker-compose.prod.yml
+++ b/dataAcquisition/docker-compose.prod.yml
@@ -1,9 +1,7 @@
+version: "3.9"
 services:
   torizon-os-build-status-data-acquisition:
     platform: linux/arm64
-    environment:
-    - DEBUG=DEBUG
-    - DEMO=1
     networks:
     - influxdbnet
     - frontend
@@ -12,12 +10,35 @@ services:
     - "8086"
     depends_on:
     - influxdb
-    image: leograba/torizon-os-build-status-data-acquisition:rc
+    image: leograba/torizon-os-build-status-data-acquisition:0.4.1
+    environment:
+    - DEBUG=DEBUG
+    - DEMO=1
+  grafana:
+    platform: linux/arm64
+    volumes:
+    - $PWD/debug/grafana-config/grafana.ini:/etc/grafana/grafana.ini
+    - $PWD/debug/grafana-config/provisioning/datasources/datasource.yaml:/etc/grafana/provisioning/datasources/datasource.yaml
+    - $PWD/debug/grafana-config/provisioning/dashboards/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml
+    - $PWD/debug/grafana-config/provisioning/dashboards/dashboard.json:/var/lib/grafana/dashboards/dashboard.json
+    ports:
+    - 3000:3000
+    networks:
+    - influxdbnet
+    - frontend
+    depends_on:
+    - influxdb
+    - torizon-os-build-status-data-acquisition
+    image: leograba/torizon-os-build-status-grafana:0.4.1
   influxdb:
-    image: leograba/torizon-os-build-status-influxdb:0.4.0
     platform: linux/arm64
     networks:
     - influxdbnet
+    deploy:
+      resources:
+        limits:
+          memory: 1G
+    image: leograba/torizon-os-build-status-influxdb:0.4.1
     environment:
     - DOCKER_INFLUXDB_INIT_MODE=setup
     - DOCKER_INFLUXDB_INIT_USERNAME=torizon
@@ -27,25 +48,8 @@ services:
     - DOCKER_INFLUXDB_INIT_RETENTION=60m
     - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=T0rizonTh3Ea&IndustrialPlatform
     - INFLUXD_LOG_LEVEL=error
-  grafana:
-    platform: linux/arm64
-    ports:
-    - 3000:3000
-    networks:
-    - influxdbnet
-    - frontend
-    image: leograba/torizon-os-build-status-grafana:0.4.0
-    depends_on:
-    - influxdb
-    - torizon-os-build-status-data-acquisition
-    volumes:
-    - $PWD/debug/grafana-config/grafana.ini:/etc/grafana/grafana.ini
-    - $PWD/debug/grafana-config/provisioning/datasources/datasource.yaml:/etc/grafana/provisioning/datasources/datasource.yaml
-    - $PWD/debug/grafana-config/provisioning/dashboards/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml
-    - $PWD/debug/grafana-config/provisioning/dashboards/dashboard.json:/var/lib/grafana/dashboards/dashboard.json
 networks:
-  frontend:
-    internal: false
   influxdbnet:
     internal: true
-version: "3.9"
+  frontend:
+    internal: false
diff --git a/dataAcquisition/docker-compose.yml b/dataAcquisition/docker-compose.yml
index 2a96df3..a093e39 100644
--- a/dataAcquisition/docker-compose.yml
+++ b/dataAcquisition/docker-compose.yml
@@ -23,7 +23,7 @@ services:
 
   influxdb:
     platform: linux/arm64
-    image: leograba/torizon-os-build-status-influxdb:0.4.0
+    image: leograba/torizon-os-build-status-influxdb:0.4.1
     networks:
       - influxdbnet
     environment:
@@ -35,10 +35,14 @@ services:
       - DOCKER_INFLUXDB_INIT_RETENTION=60m
       - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=T0rizonTh3Ea&IndustrialPlatform
       - INFLUXD_LOG_LEVEL=error
+    deploy:
+      resources:
+          limits:
+            memory: 1G
   
   grafana:
     platform: linux/arm64
-    image: leograba/torizon-os-build-status-grafana:0.4.0
+    image: leograba/torizon-os-build-status-grafana:0.4.1
     networks:
       - influxdbnet
       - frontend
diff --git a/dataAcquisition/get-build-status.sh b/dataAcquisition/get-build-status.sh
index e4dc769..4f99354 100755
--- a/dataAcquisition/get-build-status.sh
+++ b/dataAcquisition/get-build-status.sh
@@ -57,7 +57,7 @@ logger "Polling interval set to $POLL_INTERVAL_SEC seconds" "INFO"
 if [[ -n "$DEMO" ]]; then
     logger "Demo mode enabled" "INFO"
     logger "Generating fake data at every poll interval" "INFO"
-    FAKEDATECOUNT=30
+    FAKEDATECOUNT=190
 else
     logger "Demo mode disabled" "INFO"
 fi
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index b5ef82d..1889b09 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -2,7 +2,7 @@ version: "3.9"
 services:
 
   data-acquisition:
-    image: leograba/torizon-os-build-status-data-acquisition:0.4.0
+    image: leograba/torizon-os-build-status-data-acquisition:0.4.1
     platform: linux/arm64
     networks:
       - influxdbnet
@@ -16,7 +16,7 @@ services:
     restart: on-failure
 
   influxdb:
-    image: leograba/torizon-os-build-status-influxdb:0.4.0
+    image: leograba/torizon-os-build-status-influxdb:0.4.1
     platform: linux/arm64
     networks:
       - influxdbnet
@@ -32,9 +32,13 @@ services:
     volumes:
       - "influxdb-storage:/var/lib/influxdb2"
     restart: on-failure
+    deploy:
+      resources:
+          limits:
+            memory: 1G
 
   grafana:
-    image: leograba/torizon-os-build-status-grafana:0.4.0
+    image: leograba/torizon-os-build-status-grafana:0.4.1
     platform: linux/arm64
     networks:
       - influxdbnet
@@ -49,7 +53,7 @@ services:
     restart: on-failure
 
   weston:
-    image: leograba/torizon-os-build-status-weston:0.4.0
+    image: leograba/torizon-os-build-status-weston:0.4.1
     platform: linux/arm
     # Required to get udev events from host udevd via netlink
     network_mode: host
@@ -76,7 +80,7 @@ services:
     restart: on-failure
 
   browser:
-    image: leograba/torizon-os-build-status-browser:0.4.0
+    image: leograba/torizon-os-build-status-browser:0.4.1
     platform: linux/arm
     environment:
       - MACHINE
diff --git a/docker-compose.rc.yml b/docker-compose.rc.yml
index c28b71f..af50e7f 100644
--- a/docker-compose.rc.yml
+++ b/docker-compose.rc.yml
@@ -32,6 +32,10 @@ services:
     volumes:
       - "influxdb-storage:/var/lib/influxdb2"
     restart: on-failure
+    deploy:
+      resources:
+          limits:
+            memory: 1G
 
   grafana:
     image: leograba/torizon-os-build-status-grafana:rc
diff --git a/docker-compose.yml b/docker-compose.yml
index 62980b4..065645c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,10 @@ services:
     volumes:
       - "influxdb-volume:/var/lib/influxdb2"
     restart: on-failure
+    deploy:
+      resources:
+          limits:
+            memory: 1G
 
   grafana:
     image: ${DOCKER_LOGIN}/torizon-os-build-status-grafana:${TAG}
diff --git a/grafana/.vscode/settings.json b/grafana/.vscode/settings.json
index 2b6ef5f..38e1bcd 100644
--- a/grafana/.vscode/settings.json
+++ b/grafana/.vscode/settings.json
@@ -15,5 +15,5 @@
 	"torizon_app_root": "/home/torizon",
 	"tcb.packageName": "TorizonOSBuildStatusGrafana",
 	"tcb.version": "3.8.1",
-	"docker_tag": "0.4.0"
+	"docker_tag": "0.4.1"
 }
\ No newline at end of file
diff --git a/grafana/docker-compose.prod.yml b/grafana/docker-compose.prod.yml
index e74cbed..54d9aff 100644
--- a/grafana/docker-compose.prod.yml
+++ b/grafana/docker-compose.prod.yml
@@ -1,4 +1,4 @@
+version: "3.9"
 services:
   torizon-os-build-status-grafana:
-    image: leograba/torizon-os-build-status-grafana:0.4.0
-version: "3.9"
+    image: leograba/torizon-os-build-status-grafana:0.4.1
diff --git a/influxdb/.vscode/settings.json b/influxdb/.vscode/settings.json
index 7b2f303..8594491 100644
--- a/influxdb/.vscode/settings.json
+++ b/influxdb/.vscode/settings.json
@@ -15,5 +15,5 @@
 	"torizon_app_root": "/home/torizon",
 	"tcb.packageName": "TorizonOSBuildStatusInfluxDB",
 	"tcb.version": "3.8.1",
-	"docker_tag": "0.4.0"
+	"docker_tag": "0.4.1"
 }
\ No newline at end of file
diff --git a/influxdb/docker-compose.prod.yml b/influxdb/docker-compose.prod.yml
index dd38529..410a002 100644
--- a/influxdb/docker-compose.prod.yml
+++ b/influxdb/docker-compose.prod.yml
@@ -1,4 +1,4 @@
-version: "3.9"
 services:
   torizon-os-build-status-influxdb:
-    image: leograba/torizon-os-build-status-influxdb:0.4.0
+    image: leograba/torizon-os-build-status-influxdb:0.4.1
+version: "3.9"
diff --git a/tcb/docker-compose.prod.yml b/tcb/docker-compose.prod.yml
index 75ee597..19c12fd 100644
--- a/tcb/docker-compose.prod.yml
+++ b/tcb/docker-compose.prod.yml
@@ -2,7 +2,7 @@ version: "3.9"
 services:
 
   data-acquisition:
-    image: leograba/torizon-os-build-status-data-acquisition:0.4.0
+    image: leograba/torizon-os-build-status-data-acquisition:0.4.1
     networks:
       - influxdbnet
       - frontend
@@ -12,7 +12,7 @@ services:
     restart: on-failure
 
   influxdb:
-    image: leograba/torizon-os-build-status-influxdb:0.4.0
+    image: leograba/torizon-os-build-status-influxdb:0.4.1
     networks:
       - influxdbnet
     environment:
@@ -28,7 +28,7 @@ services:
     restart: on-failure
 
   grafana:
-    image: leograba/torizon-os-build-status-grafana:0.4.0
+    image: leograba/torizon-os-build-status-grafana:0.4.1
     networks:
       - influxdbnet
       - frontend
@@ -42,7 +42,7 @@ services:
     restart: on-failure
 
   weston:
-    image: leograba/torizon-os-build-status-weston:0.4.0
+    image: leograba/torizon-os-build-status-weston:0.4.1
     # Required to get udev events from host udevd via netlink
     network_mode: host
     volumes:
@@ -68,7 +68,7 @@ services:
     restart: on-failure
 
   browser:
-    image: leograba/torizon-os-build-status-browser:0.4.0
+    image: leograba/torizon-os-build-status-browser:0.4.1
     environment:
       - MACHINE
     security_opt:
diff --git a/weston/.vscode/settings.json b/weston/.vscode/settings.json
index 2dfaa46..ca5be50 100644
--- a/weston/.vscode/settings.json
+++ b/weston/.vscode/settings.json
@@ -15,5 +15,5 @@
 	"torizon_app_root": "/home/torizon",
 	"tcb.packageName": "TorizonOSBuildStatusWeston",
 	"tcb.version": "3.8.1",
-	"docker_tag": "0.4.0"
+	"docker_tag": "0.4.1"
 }
\ No newline at end of file
diff --git a/weston/docker-compose.prod.yml b/weston/docker-compose.prod.yml
index 1e1e6dd..08d0232 100644
--- a/weston/docker-compose.prod.yml
+++ b/weston/docker-compose.prod.yml
@@ -1,4 +1,4 @@
-version: "3.9"
 services:
   torizon-os-build-status-weston:
-    image: leograba/torizon-os-build-status-weston:0.4.0
+    image: leograba/torizon-os-build-status-weston:0.4.1
+version: "3.9"