diff --git a/docker-compose.arm64.yml b/docker-compose.arm64.yml
index 68446b15..d0f68389 100644
--- a/docker-compose.arm64.yml
+++ b/docker-compose.arm64.yml
@@ -3,6 +3,7 @@ services:
     gateway:
         ports:
             - 8080:8080
+            - 8082:8082
         image: openfaas/gateway:0.11.0-arm64
         networks:
             - functions
diff --git a/docker-compose.armhf.yml b/docker-compose.armhf.yml
index 1a72fcfa..a53fc8d7 100644
--- a/docker-compose.armhf.yml
+++ b/docker-compose.armhf.yml
@@ -3,6 +3,7 @@ services:
     gateway:
         ports:
             - 8080:8080
+            - 8082:8082
         image: openfaas/gateway:0.11.0-armhf
         networks:
             - functions
diff --git a/docker-compose.yml b/docker-compose.yml
index d9b5d443..1ddd55ee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@ services:
     gateway:
         ports:
             - 8080:8080
+            - 8082:8082
         image: openfaas/gateway:0.11.1
         networks:
             - functions
diff --git a/gateway/Dockerfile b/gateway/Dockerfile
index 206f8cc8..cec780b2 100644
--- a/gateway/Dockerfile
+++ b/gateway/Dockerfile
@@ -48,6 +48,7 @@ RUN addgroup -S app \
 WORKDIR /home/app
 
 EXPOSE 8080
+EXPOSE 8082
 ENV http_proxy      ""
 ENV https_proxy     ""
 
diff --git a/gateway/Dockerfile.arm64 b/gateway/Dockerfile.arm64
index e618caee..05dfae4c 100644
--- a/gateway/Dockerfile.arm64
+++ b/gateway/Dockerfile.arm64
@@ -29,6 +29,7 @@ RUN addgroup -S app \
 WORKDIR /home/app
 
 EXPOSE 8080
+EXPOSE 8082
 ENV http_proxy      ""
 ENV https_proxy     ""
 
diff --git a/gateway/Dockerfile.armhf b/gateway/Dockerfile.armhf
index a2abf10d..5b72f0c3 100644
--- a/gateway/Dockerfile.armhf
+++ b/gateway/Dockerfile.armhf
@@ -48,6 +48,7 @@ RUN addgroup -S app \
 WORKDIR /home/app
 
 EXPOSE 8080
+EXPOSE 8082
 ENV http_proxy      ""
 ENV https_proxy     ""
 
diff --git a/gateway/server.go b/gateway/server.go
index d0d87acd..e85bf8d6 100644
--- a/gateway/server.go
+++ b/gateway/server.go
@@ -207,7 +207,22 @@ func main() {
 	}
 
 	metricsHandler := metrics.PrometheusHandler()
-	r.Handle("/metrics", metricsHandler)
+
+	//Create a new server to serve /metrics endpoint
+	go func() {
+		routes := mux.NewRouter()
+		routes.Handle("/metrics", metricsHandler)
+		port := 8082
+		s := &http.Server{
+			Addr:           fmt.Sprintf(":%d", port),
+			ReadTimeout:    config.ReadTimeout,
+			WriteTimeout:   config.WriteTimeout,
+			MaxHeaderBytes: http.DefaultMaxHeaderBytes,
+			Handler:        routes,
+		}
+		log.Fatal(s.ListenAndServe())
+	}()
+
 	r.HandleFunc("/healthz", handlers.MakeForwardingProxyHandler(reverseProxy, forwardingNotifiers, urlResolver, nilURLTransformer)).Methods(http.MethodGet)
 
 	r.Handle("/", http.RedirectHandler("/ui/", http.StatusMovedPermanently)).Methods(http.MethodGet)
diff --git a/prometheus/k8s.prometheus.yml b/prometheus/k8s.prometheus.yml
index 41c082d6..9d8c32b5 100644
--- a/prometheus/k8s.prometheus.yml
+++ b/prometheus/k8s.prometheus.yml
@@ -32,6 +32,6 @@ scrape_configs:
     scrape_interval: 5s
     dns_sd_configs:
       - names: ['gateway.default.svc.cluster.local']
-        port: 8080
+        port: 8082
         type: A
         refresh_interval: 5s
diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml
index 75bff917..f19d30ea 100644
--- a/prometheus/prometheus.yml
+++ b/prometheus/prometheus.yml
@@ -32,7 +32,7 @@ scrape_configs:
     scrape_interval: 5s
     dns_sd_configs:
       - names: ['tasks.gateway']
-        port: 8080
+        port: 8082
         type: A
         refresh_interval: 5s