diff --git a/docker-compose.yml b/docker-compose.yml
index f98e72c5..4df296e0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,9 +8,12 @@ services:
       dockerfile: Dockerfile
     ports:
       - "8000:8000"
+      - "8089:8089/udp"
+      - "8090:8090/udp"
+      - "8091:8091/udp"
+      - "8092:8092/udp"
     depends_on:
       - influxdb
-      - influxdb2
       - redis
 
   influxdb:
@@ -29,20 +32,6 @@ services:
       INFLUXDB_USER: openwisp
       INFLUXDB_USER_PASSWORD: openwisp
 
-  influxdb2:
-    image: influxdb:2.0-alpine
-    volumes:
-      - influxdb2-data:/var/lib/influxdb2
-    ports:
-      - "8087:8086"
-    environment:
-      DOCKER_INFLUXDB_INIT_MODE: setup
-      DOCKER_INFLUXDB_INIT_USERNAME: openwisp
-      DOCKER_INFLUXDB_INIT_PASSWORD: openwisp
-      DOCKER_INFLUXDB_INIT_ORG: openwisp
-      DOCKER_INFLUXDB_INIT_BUCKET: openwisp2
-      DOCKER_INFLUXDB_INIT_RETENTION: 1w
-
   redis:
     image: redis:5.0-alpine
     ports:
@@ -51,4 +40,3 @@ services:
 
 volumes:
   influxdb-data: {}
-  influxdb2-data: {}
diff --git a/openwisp_monitoring/db/backends/influxdb2/tests.py b/openwisp_monitoring/db/backends/influxdb2/tests.py
index eb3cd512..9bf8aca9 100644
--- a/openwisp_monitoring/db/backends/influxdb2/tests.py
+++ b/openwisp_monitoring/db/backends/influxdb2/tests.py
@@ -420,7 +420,7 @@ def test_retry_mechanism(self, mock_query):
 
 class TestDatabaseClientUdp(TestMonitoringMixin, TestCase):
     def test_exceed_udp_packet_limit(self):
-        # InfluxDB 2.x does not use UDP for writing data, but this test is kept
+        # InfluxDB 2.x does not use UDP for writing data, but this is kept
         # for backward compatibility reference
         timeseries_db.write(
             'test_udp_write', dict(value='O' * 66000), database=self.TEST_DB