diff --git a/docker-compose.armhf.yml b/docker-compose.armhf.yml
index 1d886fb9..858f9814 100644
--- a/docker-compose.armhf.yml
+++ b/docker-compose.armhf.yml
@@ -3,14 +3,14 @@ services:
     gateway:
         ports:
             - 8080:8080
-        image: openfaas/gateway:0.8.12-armhf
+        image: openfaas/gateway:0.9.0-armhf
         networks:
             - functions
         environment:
             functions_provider_url: "http://faas-swarm:8080/"
-            read_timeout:  "25s"        # Maximum time to read HTTP request
-            write_timeout: "25s"        # Maximum time to write HTTP response
-            upstream_timeout: "20s"     # Maximum duration of upstream function call - should be more than read_timeout and write_timeout            dnsrr: "true"  # Temporarily use dnsrr in place of VIP while issue persists on PWD
+            read_timeout:  "305s"        # Maximum time to read HTTP request
+            write_timeout: "305s"        # Maximum time to write HTTP response
+            upstream_timeout: "300s"     # Maximum duration of upstream function call - should be more than read_timeout and write_timeout            dnsrr: "true"  # Temporarily use dnsrr in place of VIP while issue persists on PWD
             faas_nats_address: "nats"
             faas_nats_port: 4222
             direct_functions: "true"    # Functions are invoked directly over the overlay network
@@ -43,8 +43,8 @@ services:
         networks:
             - functions
         environment:
-            read_timeout:  "25s"   # set both here, and on your functions
-            write_timeout: "25s"   # set both here, and on your functions
+            read_timeout:  "305s"   # set both here, and on your functions
+            write_timeout: "305s"   # set both here, and on your functions
             DOCKER_API_VERSION: "1.30"
         deploy:
             placement:
diff --git a/docker-compose.yml b/docker-compose.yml
index eecaf52f..f2b0cc06 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
     gateway:
         ports:
             - 8080:8080
-        image: openfaas/gateway:0.8.11
+        image: openfaas/gateway:0.9.0
         networks:
             - functions
         environment: