diff --git a/docker-compose/apsct-sim.yml b/docker-compose/apsct-sim.yml
index 00146bfc89ed454928e615c6ea98aa5931c56242..9dc5c14a9e0a6a13521e1fe442b6b5eef848155a 100644
--- a/docker-compose/apsct-sim.yml
+++ b/docker-compose/apsct-sim.yml
@@ -4,7 +4,7 @@
 # Defines:
 #   - apsct-sim
 #
-version: '2'
+version: '2.1'
 
 services:
   apsct-sim:
diff --git a/docker-compose/apspu-sim.yml b/docker-compose/apspu-sim.yml
index 62ba7267cfc89f5394a254c81f90909467cca43b..0f164a5a3321ab25d7083ce896a56bcc4e6af2e0 100644
--- a/docker-compose/apspu-sim.yml
+++ b/docker-compose/apspu-sim.yml
@@ -4,7 +4,7 @@
 # Defines:
 #   - apspu-sim
 #
-version: '2'
+version: '2.1'
 
 services:
   apspu-sim:
diff --git a/docker-compose/archiver-timescale.yml b/docker-compose/archiver-timescale.yml
index 7d0bd2ea397988ec24f4c5cb6df2dc4da885a5b4..cdbf1b03788117308fa97227e3d83b452a77395a 100644
--- a/docker-compose/archiver-timescale.yml
+++ b/docker-compose/archiver-timescale.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 
 volumes:
   archiver-timescale-data: {}
diff --git a/docker-compose/device-antennafield.yml b/docker-compose/device-antennafield.yml
index de2d65c060a50b911cba18e471cb9e762d963fff..d33dacac0139a2a2946f3c19f3cdc2979cf76e30 100644
--- a/docker-compose/device-antennafield.yml
+++ b/docker-compose/device-antennafield.yml
@@ -10,7 +10,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 
 services:
diff --git a/docker-compose/device-apsct.yml b/docker-compose/device-apsct.yml
index 57799c0db1f9ce827f7413b1f2a49c9e6a0a647b..cb43adf7b800498d4448fdcc2ef99cbf577e11d5 100644
--- a/docker-compose/device-apsct.yml
+++ b/docker-compose/device-apsct.yml
@@ -10,7 +10,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-apsct:
diff --git a/docker-compose/device-apspu.yml b/docker-compose/device-apspu.yml
index e4f4e5a0c8a6a51f04b6dd476fa38a597e738d1d..6613b210971f7514c0822cd82f5185af550f4e2a 100644
--- a/docker-compose/device-apspu.yml
+++ b/docker-compose/device-apspu.yml
@@ -10,7 +10,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-apspu:
diff --git a/docker-compose/device-beamlet.yml b/docker-compose/device-beamlet.yml
index d54366ccf8af2c5363971eeb343ce7e15a8b9f29..6d067c1544bb805578cfa53ba486a39313238b75 100644
--- a/docker-compose/device-beamlet.yml
+++ b/docker-compose/device-beamlet.yml
@@ -10,7 +10,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-beamlet:
diff --git a/docker-compose/device-boot.yml b/docker-compose/device-boot.yml
index 339b88f4d6462de4b29c1efa232a822177d54a29..0388c08229c38f9abd475d4e59efd46ce7a14548 100644
--- a/docker-compose/device-boot.yml
+++ b/docker-compose/device-boot.yml
@@ -9,7 +9,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-boot:
diff --git a/docker-compose/device-bst.yml b/docker-compose/device-bst.yml
index 57ef90b8f17bee3191ab17f72580f9d78e486b2c..c06514b4f3a738ad45ffb847d5b261e515b58a6a 100644
--- a/docker-compose/device-bst.yml
+++ b/docker-compose/device-bst.yml
@@ -10,7 +10,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-bst:
diff --git a/docker-compose/device-digitalbeam.yml b/docker-compose/device-digitalbeam.yml
index 81930a0f297cf882b98c3d8bbafacefa2b1affcb..32847ca8d6ce995baeee599ea20cb1c0919b9084 100644
--- a/docker-compose/device-digitalbeam.yml
+++ b/docker-compose/device-digitalbeam.yml
@@ -10,7 +10,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-digitalbeam:
diff --git a/docker-compose/device-docker.yml b/docker-compose/device-docker.yml
index 7cb990b97744af5d14df2b486263575788ac5061..2be9467ea6d63fbf08fc30e954de74a585bbe6a3 100644
--- a/docker-compose/device-docker.yml
+++ b/docker-compose/device-docker.yml
@@ -10,7 +10,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-docker:
diff --git a/docker-compose/device-observation.yml b/docker-compose/device-observation.yml
index 28beae49945ced6526648893b81eb57783aeb2f8..ee8f3a1653b447965af9891258de1e8642242e60 100644
--- a/docker-compose/device-observation.yml
+++ b/docker-compose/device-observation.yml
@@ -8,7 +8,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-observation:
diff --git a/docker-compose/device-observation_control.yml b/docker-compose/device-observation_control.yml
index 3887560cdc3875e6aa95b1182f9a8b5c30162dcd..4c84af7921444ab0923757ccff43d681d7120cb3 100644
--- a/docker-compose/device-observation_control.yml
+++ b/docker-compose/device-observation_control.yml
@@ -9,7 +9,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-observation_control:
diff --git a/docker-compose/device-pdu.yml b/docker-compose/device-pdu.yml
index 628a1e0b7b5ceb5c58170164ebec6475a94fd6f3..c1c2af57f2c385c41b241322fb84366ab7e06c88 100644
--- a/docker-compose/device-pdu.yml
+++ b/docker-compose/device-pdu.yml
@@ -2,7 +2,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 volumes:
   iers-data: {}
diff --git a/docker-compose/device-recv.yml b/docker-compose/device-recv.yml
index d3d1ade7af7b43d728cd3ef8df1b02bce4854a3c..10126cae3612ad12ca6e77c1b191b2879091f1d4 100644
--- a/docker-compose/device-recv.yml
+++ b/docker-compose/device-recv.yml
@@ -10,7 +10,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-recv:
diff --git a/docker-compose/device-sdp.yml b/docker-compose/device-sdp.yml
index 653efb2ad352e63936f75dbfda758b3406dadb06..2e9c77312d96b800f06e3c85e6773613a0af758b 100644
--- a/docker-compose/device-sdp.yml
+++ b/docker-compose/device-sdp.yml
@@ -10,7 +10,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-sdp:
diff --git a/docker-compose/device-sst.yml b/docker-compose/device-sst.yml
index 10057ee969cc2d3c66b0b59fcfb81b3f8b67b331..54c221f3b6c051078d55009ec583d0ddab8dd46b 100644
--- a/docker-compose/device-sst.yml
+++ b/docker-compose/device-sst.yml
@@ -10,7 +10,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-sst:
diff --git a/docker-compose/device-temperature-manager.yml b/docker-compose/device-temperature-manager.yml
index cf1ac02fd36bbf0a7ef63ba05979e8702fad8985..4729bd631b87508b12be14b24a9c4e1bbbccf98b 100644
--- a/docker-compose/device-temperature-manager.yml
+++ b/docker-compose/device-temperature-manager.yml
@@ -2,7 +2,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 volumes:
   iers-data: {}
diff --git a/docker-compose/device-tilebeam.yml b/docker-compose/device-tilebeam.yml
index 1d243a6e18dc34f43309ec95f0d65e2c34cf2ee2..20e44c90c112c3ce7a4f3c7c09682c897c032a30 100644
--- a/docker-compose/device-tilebeam.yml
+++ b/docker-compose/device-tilebeam.yml
@@ -2,7 +2,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 volumes:
   iers-data: {}
diff --git a/docker-compose/device-unb2.yml b/docker-compose/device-unb2.yml
index e753f79c2945fdac87f33d1ff0cfe80104d162ed..9a7505f0beb6b6f3f7448a402e812a86ad2c033d 100644
--- a/docker-compose/device-unb2.yml
+++ b/docker-compose/device-unb2.yml
@@ -10,7 +10,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-unb2:
diff --git a/docker-compose/device-xst.yml b/docker-compose/device-xst.yml
index cb7ec371e518cd239c44dd00859618c2ae0936f2..1ed7a1fe3892c900b14c9c275099816fb45b90a3 100644
--- a/docker-compose/device-xst.yml
+++ b/docker-compose/device-xst.yml
@@ -10,7 +10,7 @@
 # Requires:
 #   - lofar-device-base.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   device-xst:
diff --git a/docker-compose/elk.yml b/docker-compose/elk.yml
index 78345420e3a7ce677096cfc22f2fdca33b5756d8..786e843ce85c16e7604341a7138c5030f1356fed 100644
--- a/docker-compose/elk.yml
+++ b/docker-compose/elk.yml
@@ -7,7 +7,7 @@
 #   - elk: ELK stack
 #
 
-version: '2'
+version: '2.1'
 
 volumes:
   elk-data: {}
diff --git a/docker-compose/grafana.yml b/docker-compose/grafana.yml
index 73c508440cd63ad201b0b4199c2443b18be804a5..16462fcd66e7973604f0fa97e338d114247b72d7 100644
--- a/docker-compose/grafana.yml
+++ b/docker-compose/grafana.yml
@@ -5,7 +5,7 @@
 #   - grafana: Grafana
 #
 
-version: '2'
+version: '2.1'
 
 #volumes:
 #  grafana-data: {}
diff --git a/docker-compose/integration-test.yml b/docker-compose/integration-test.yml
index 944f47a3580484430a40eaf9a0b94e57902f1df3..346bbbcc5b179c2066c08a0064335c23957fb902 100644
--- a/docker-compose/integration-test.yml
+++ b/docker-compose/integration-test.yml
@@ -4,7 +4,7 @@
 # Defines:
 #   - integration: Integration testing
 #
-version: '2'
+version: '2.1'
 
 services:
   integration-test:
diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index 3e3df5a537e022a3ea4f82f55bf16e9264db7bb3..9e453cddc2dc5fedde29062e81d2f3e48f27e472 100644
--- a/docker-compose/itango.yml
+++ b/docker-compose/itango.yml
@@ -10,7 +10,7 @@
 # Requires:
 #   - tango.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   itango:
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index 8bc6eb8cefd72b56dda08af054ea1fa7716939f1..0c5356aeb78adc0fbc11c10fe1588bf1aa2da0ce 100644
--- a/docker-compose/jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -8,7 +8,7 @@
 #   - jupyter: Jupyter Notebook with iTango support
 #
 
-version: '2'
+version: '2.1'
 
 services:
   jupyter:
diff --git a/docker-compose/lofar-device-base.yml b/docker-compose/lofar-device-base.yml
index da0a0c5a9495193a830330afdb4d5110e6fa5d07..34f3f1c92c06fadd45b634a2a93bae994a54edeb 100644
--- a/docker-compose/lofar-device-base.yml
+++ b/docker-compose/lofar-device-base.yml
@@ -11,7 +11,7 @@
 #   - tango.yml
 #
 
-version: '2'
+version: '2.1'
 
 services:
   lofar-device-base:
diff --git a/docker-compose/networks.yml b/docker-compose/networks.yml
index bdacc3005a15a91a5120790e4ac288dacd54030a..0799fa1c0e10f903d8ee8c566455f7bbaaaee343 100644
--- a/docker-compose/networks.yml
+++ b/docker-compose/networks.yml
@@ -1,7 +1,7 @@
 #
 # Docker compose file that describes our docker networks.
 #
-version: '3.5'
+version: '2.1'
 
 networks:
 
diff --git a/docker-compose/prometheus-node-exporter.yml b/docker-compose/prometheus-node-exporter.yml
index da82726fc2ebec19bdba44067ea813adeb618170..a6d5b00f9b173380ef548566c5c8333826e7f031 100644
--- a/docker-compose/prometheus-node-exporter.yml
+++ b/docker-compose/prometheus-node-exporter.yml
@@ -4,7 +4,7 @@
 # Provides system metrics for Prometheus to scrape
 #
 
-version: '2'
+version: '2.1'
 
 services:
   prometheus-node-exporter:
diff --git a/docker-compose/prometheus.yml b/docker-compose/prometheus.yml
index f91a1a17428b5abf7e53149377a21629539b3bb9..0ccc8adb3501c1ac161df9bf418474ba1eac5ee4 100644
--- a/docker-compose/prometheus.yml
+++ b/docker-compose/prometheus.yml
@@ -5,7 +5,7 @@
 #   - prometheus: Prometheus
 #
 
-version: '2'
+version: '2.1'
 
 volumes:
   prometheus-data: {}
diff --git a/docker-compose/recv-sim.yml b/docker-compose/recv-sim.yml
index 574385ef1669e8586bffe4d4e90b14a51d8e3429..2dfeb4837cb00d891ec0213418698fba61b13c84 100644
--- a/docker-compose/recv-sim.yml
+++ b/docker-compose/recv-sim.yml
@@ -4,7 +4,7 @@
 # Defines:
 #   - recv-sim
 #
-version: '2'
+version: '2.1'
 
 services:
   recv-sim:
diff --git a/docker-compose/rest.yml b/docker-compose/rest.yml
index 94e1168455ddfefa20796c352e92d27e07f9a115..a1d09ecb3b65e2577b028bb319d920c896281474 100644
--- a/docker-compose/rest.yml
+++ b/docker-compose/rest.yml
@@ -9,7 +9,7 @@
 # Requires:
 #   - tango.yml
 #
-version: '2'
+version: '2.1'
 
 services:
   rest:
diff --git a/docker-compose/sdptr-sim.yml b/docker-compose/sdptr-sim.yml
index 112b6d4e5b41dff3cddc481d80539c02c39c62ba..e9fbdd7a09bbdd29df1a1d0e1ae94f73dec2bb65 100644
--- a/docker-compose/sdptr-sim.yml
+++ b/docker-compose/sdptr-sim.yml
@@ -4,7 +4,7 @@
 # Defines:
 #   - sdptr-sim
 #
-version: '2'
+version: '2.1'
 
 services:
   sdptr-sim:
diff --git a/docker-compose/tango-prometheus-exporter.yml b/docker-compose/tango-prometheus-exporter.yml
index 87ca7109f6bdd512b97c81e5e32685f7029d9748..5eca2be50ac8d1c1e88a4018c6de7354b02a695e 100644
--- a/docker-compose/tango-prometheus-exporter.yml
+++ b/docker-compose/tango-prometheus-exporter.yml
@@ -1,7 +1,7 @@
 #
 # Docker compose file that launches the Tango -> Prometheus adapter
 #
-version: '2'
+version: '2.1'
 
 services:
   tango-prometheus-exporter:
diff --git a/docker-compose/tango.yml b/docker-compose/tango.yml
index c9cdac909bf4a863367f3541b1e77d5be659fd2a..65cda98f8b1c045ed67673129c39417f78a8c2d3 100644
--- a/docker-compose/tango.yml
+++ b/docker-compose/tango.yml
@@ -8,7 +8,7 @@
 # Requires:
 #   - None
 #
-version: '2'
+version: '2.1'
 
 volumes:
   tangodb: {}
diff --git a/docker-compose/unb2-sim.yml b/docker-compose/unb2-sim.yml
index b68e1d9c80509b3af5f9075fd274fdf9d69a4f76..e29c805010f559f5254fd116f5a75b497710367c 100644
--- a/docker-compose/unb2-sim.yml
+++ b/docker-compose/unb2-sim.yml
@@ -4,7 +4,7 @@
 # Defines:
 #   - unb2-sim
 #
-version: '2'
+version: '2.1'
 
 services:
   unb2-sim: