diff --git a/configuration/chirpstack/adr-modules/sensade-adr-mod/sensade-adr.js b/configuration/chirpstack/adr-modules/sensade-adr-mod/sensade-adr.js
index e0d2005..b59ad88 100644
--- a/configuration/chirpstack/adr-modules/sensade-adr-mod/sensade-adr.js
+++ b/configuration/chirpstack/adr-modules/sensade-adr-mod/sensade-adr.js
@@ -43,20 +43,19 @@ export function id() {
 //  txPowerIndex: 1,
 //  nbTrans: 1
 // }
+
 // Handle function for ADR request.
 export function handle(req) {
   // This defines the default response, which is equal to the current device state.
   let resp = {
-    dr: req.DR,
-    txPowerIndex: req.TxPowerIndex,
-    nbTrans: req.NbTrans,
+    dr: req.dr,
+    txPowerIndex: 0,
+    nbTrans: req.nbTrans,
   };
 
-  resp.txPowerIndex = 0;
-
   // If ADR is disabled, return with current values.
-  if (!req.ADR) {
-    return [resp, null];
+  if (!req.adr) {
+    return resp;
   }
 
   let lostPackageCnt = getLostPackageCount(req);
@@ -64,7 +63,7 @@ export function handle(req) {
   if (lostPackageCnt >= 5) {
     resp.dr -= 1;
   } else if (
-    req.UplinkHistory.length === 20 &&
+    req.uplinkHistory.length >= 20 &&
     getLostPackageCount(req, 20) <= 2
   ) {
     // If 2 or fewer packages are lost during the last 20 received packages, the dr might be able to be increased
@@ -78,7 +77,7 @@ export function handle(req) {
     // A margin of around 10 seems okay
     // This value has been chosen based on the loRaSNR values from sensors installed in a parking lot,
     // where a fluctuation of +- 10 can be seen (should be caused by cars parking and leaving).
-    let diffSNR = minSNR - req.requiredHistoryCount - installationMargin;
+    let diffSNR = minSNR - req.requiredSnrForDr - installationMargin;
 
     // Examples:
     // minSNR = -5
@@ -104,11 +103,11 @@ export function handle(req) {
     resp.dr = req.maxDr;
   }
 
-  if (req.MinDR > resp.dr) {
-    resp.dr = req.MinDR;
+  if (req.minDr > resp.dr) {
+    resp.dr = req.minDr;
   }
 
-  return [resp, null];
+  return resp;
 }
 
 function getMinSNR(req) {
@@ -144,12 +143,12 @@ function getLostPackageCount(req, ...lastXElement) {
     const m = elements[i];
 
     if (i === 0) {
-      previousFCnt = m.FCnt;
+      previousFCnt = m.fCnt;
       continue;
     }
 
-    lostPackets += m.FCnt - previousFCnt - 1; // there is always an expected difference of 1
-    previousFCnt = m.FCnt;
+    lostPackets += m.fCnt - previousFCnt - 1; // there is always an expected difference of 1
+    previousFCnt = m.fCnt;
   }
 
   return lostPackets;
diff --git a/docker-compose.yml b/docker-compose.yml
index 830fc1b..4f61b0e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -146,7 +146,7 @@ services:
       - pg-data:/var/lib/postgresql:Z
 
   os2iot-zookeeper:
-    image: "bitnami/zookeeper:latest"
+    image: "bitnamilegacy/zookeeper:latest"
     ports:
       - "2181:2181"
     environment:
@@ -156,7 +156,7 @@ services:
     tmpfs: "/datalog"
 
   os2iot-kafka:
-    image: "bitnami/kafka:latest"
+    image: "bitnamilegacy/kafka:3"
     ports:
       - "9092:9092"
       - "9093:9093"
diff --git a/mosquitto-broker/Dockerfile b/mosquitto-broker/Dockerfile
index 0b6291a..ecf04be 100644
--- a/mosquitto-broker/Dockerfile
+++ b/mosquitto-broker/Dockerfile
@@ -58,6 +58,8 @@ RUN git clone https://github.com/iegomez/mosquitto-go-auth.git
 
 WORKDIR /home/mosquitto-go-auth
 
+RUN git checkout tags/2.1.0
+
 RUN make
 
 WORKDIR /etc/mosquitto/conf.d
diff --git a/simulator/Dockerfile b/simulator/Dockerfile
index 2e42dee..aff8b49 100644
--- a/simulator/Dockerfile
+++ b/simulator/Dockerfile
@@ -7,10 +7,11 @@ RUN apt-get update && apt-get install git -y
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install golang -y
+RUN apt-get install golang-statik -y
 
 RUN apt-get install ca-certificates -y
 
-RUN git clone --branch v1.0.2 https://github.com/UniCT-ARSLab/LWN-Simulator.git
+RUN git clone https://github.com/UniCT-ARSLab/LWN-Simulator.git
 
 WORKDIR /LWN-Simulator