diff --git a/.homeychangelog.json b/.homeychangelog.json
index 8160a90..a66c47f 100644
--- a/.homeychangelog.json
+++ b/.homeychangelog.json
@@ -16,5 +16,8 @@
   },
   "2.13.8": {
     "en": "[IMPORTANT] Deprecated support for Yeelights, they will get their own standalone app. Please read the announcement in the support topic on migrating your Yeelights."
+  },
+  "2.13.9": {
+    "en": "Deprecated the driver for the Xiaomi Gateway. Xiaomi changed something resulting in the current implementation not working anymore."
   }
 }
diff --git a/app.json b/app.json
index 55e5b82..47c6e62 100644
--- a/app.json
+++ b/app.json
@@ -10,7 +10,7 @@
 		"en": [ "Xiaomi", "Mi", "Mi Home", "miio", "vacuumcleaner", "robot", "purifier", "humidifier", "philips", "eyecare", "powerplug", "gateway" ],
 		"nl": [ "Xiaomi", "Mi", "Mi home", "miio", "stofzuiger", "robot", "luchtreiniger", "luchtbevochtiger", "philips", "eyecare", "powerplug", "gateway" ]
 	},
-	"version": "2.13.8",
+	"version": "2.13.9",
 	"compatibility": ">=3.0.0",
 	"author": {
 		"name": "Jelger Haanstra",
@@ -698,6 +698,7 @@
 				"en": "Gateway",
 				"nl": "Gateway"
 			},
+      "deprecated": true,
 			"images": {
 				"large": "drivers/gateway/assets/images/large.jpg",
 				"small": "drivers/gateway/assets/images/small.jpg"
@@ -1886,6 +1887,7 @@
 			},
       {
 				"id": "armGateway",
+        "deprecated": true,
 				"title": {
 					"en": "Set surveillance mode",
 					"nl": "Stel toezicht modus in"
diff --git a/drivers/air-monitor/device.js b/drivers/air-monitor/device.js
index 3447178..586ed83 100644
--- a/drivers/air-monitor/device.js
+++ b/drivers/air-monitor/device.js
@@ -100,7 +100,7 @@ class MiAirMonitorDevice extends Homey.Device {
       setTimeout(() => {
         this.createDevice();
       }, 2000);
-    }, 300000);
+    }, 3600000);
   }
 }
 
diff --git a/drivers/dmaker-fan/device.js b/drivers/dmaker-fan/device.js
index ebe41b0..69714b2 100644
--- a/drivers/dmaker-fan/device.js
+++ b/drivers/dmaker-fan/device.js
@@ -118,7 +118,7 @@ class DmakerFanDevice extends Homey.Device {
       setTimeout(() => {
         this.createDevice();
       }, 2000);
-    }, 300000);
+    }, 3600000);
   }
 }
 
diff --git a/drivers/gateway/device.js b/drivers/gateway/device.js
index 8c386b5..42c31ab 100644
--- a/drivers/gateway/device.js
+++ b/drivers/gateway/device.js
@@ -172,7 +172,7 @@ class GatewayDevice extends Homey.Device {
       setTimeout(() => {
         this.createDevice();
       }, 2000);
-    }, 300000);
+    }, 3600000);
   }
 }
 
diff --git a/drivers/mi-airpurifier/device.js b/drivers/mi-airpurifier/device.js
index b498c02..ce8c483 100644
--- a/drivers/mi-airpurifier/device.js
+++ b/drivers/mi-airpurifier/device.js
@@ -107,7 +107,7 @@ class MiAirPurifierDevice extends Homey.Device {
       setTimeout(() => {
         this.createDevice();
       }, 2000);
-    }, 300000);
+    }, 3600000);
   }
 }
 
diff --git a/drivers/mi-humidifier/device.js b/drivers/mi-humidifier/device.js
index 354fb12..344fa94 100644
--- a/drivers/mi-humidifier/device.js
+++ b/drivers/mi-humidifier/device.js
@@ -103,7 +103,7 @@ class MiHumidifierDevice extends Homey.Device {
       setTimeout(() => {
         this.createDevice();
       }, 2000);
-    }, 300000);
+    }, 3600000);
   }
 }
 
diff --git a/drivers/mi-humidifier2/device.js b/drivers/mi-humidifier2/device.js
index b1f3358..d88bc1b 100644
--- a/drivers/mi-humidifier2/device.js
+++ b/drivers/mi-humidifier2/device.js
@@ -112,7 +112,7 @@ class MiHumidifier2Device extends Homey.Device {
       setTimeout(() => {
         this.createDevice();
       }, 2000);
-    }, 300000);
+    }, 3600000);
   }
 }
 
diff --git a/drivers/mi-power-plug/device.js b/drivers/mi-power-plug/device.js
index a506318..2ff8434 100644
--- a/drivers/mi-power-plug/device.js
+++ b/drivers/mi-power-plug/device.js
@@ -92,7 +92,7 @@ class PowerPlugDevice extends Homey.Device {
       setTimeout(() => {
         this.createDevice();
       }, 2000);
-    }, 300000);
+    }, 3600000);
   }
 }
 
diff --git a/drivers/mi-power-strip/device.js b/drivers/mi-power-strip/device.js
index 1cc826c..cd36eec 100644
--- a/drivers/mi-power-strip/device.js
+++ b/drivers/mi-power-strip/device.js
@@ -100,7 +100,7 @@ class PowerStripDevice extends Homey.Device {
       setTimeout(() => {
         this.createDevice();
       }, 2000);
-    }, 300000);
+    }, 3600000);
   }
 }
 
diff --git a/drivers/mi-robot/device.js b/drivers/mi-robot/device.js
index 7d07dd3..5ce4209 100644
--- a/drivers/mi-robot/device.js
+++ b/drivers/mi-robot/device.js
@@ -186,7 +186,7 @@ class MiRobotDevice extends Homey.Device {
       setTimeout(() => {
         this.createDevice();
       }, 2000);
-    }, 300000);
+    }, 3600000);
   }
 }
 
diff --git a/drivers/philips-bulb/device.js b/drivers/philips-bulb/device.js
index 8b952a8..b4f86c1 100644
--- a/drivers/philips-bulb/device.js
+++ b/drivers/philips-bulb/device.js
@@ -128,7 +128,7 @@ class PhilipsBulbDevice extends Homey.Device {
       setTimeout(() => {
         this.createDevice();
       }, 2000);
-    }, 300000);
+    }, 3600000);
   }
 }
 
diff --git a/drivers/philips-eyecare/device.js b/drivers/philips-eyecare/device.js
index b2b044e..7f8ba74 100644
--- a/drivers/philips-eyecare/device.js
+++ b/drivers/philips-eyecare/device.js
@@ -114,7 +114,7 @@ class PhilipsEyecareDevice extends Homey.Device {
       setTimeout(() => {
         this.createDevice();
       }, 2000);
-    }, 300000);
+    }, 3600000);
   }
 }
 
diff --git a/drivers/zhimi-fan/device.js b/drivers/zhimi-fan/device.js
index db98a8e..8e5c963 100644
--- a/drivers/zhimi-fan/device.js
+++ b/drivers/zhimi-fan/device.js
@@ -111,7 +111,7 @@ class ZhiMiFanDevice extends Homey.Device {
       setTimeout(() => {
         this.createDevice();
       }, 2000);
-    }, 300000);
+    }, 3600000);
   }
 }
 
diff --git a/package-lock.json b/package-lock.json
index 6cef4fb..c01a576 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "com.xiaomi-miio",
-  "version": "2.13.8",
+  "version": "2.13.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9ee60b0..1010c84 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.xiaomi-miio",
-  "version": "2.13.8",
+  "version": "2.13.9",
   "description": "Xiaomi Mi Home",
   "main": "app.js",
   "dependencies": {