diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 493a90d4a..64b532bed 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -204,12 +204,6 @@ If you have a deeply technical request or need help debugging your application t
 
     There is a weekly Zoom call for any free user or customer to attend, topics are taken at the beginning of the call, and we will strive to give everyone time to talk.
 
-* Doesn't Open Source mean that everything is free?
-
-    The OpenFaaS Community Edition (CE) projects are licensed as MIT which means that you are free to use, modify and distribute the software within the terms of the license.
-    
-    Contributions, suggestions and feedback is welcomed in the appropriate channels as outlined in this guide. The MIT license does not cover support for PRs, Issues, Technical Support questions, feature requests and technical support/professional services which you may require; the preceding are not free and have a cost to those providing the services.
-
 * What is the SLA for my Issue?
 
     Issues are examined, triaged and answered on a best effort basis by volunteers and community contributors. This means that you may receive an initial response within any time period such as: 1 minute, 1 hour, 1 day, or 1 week. There is no implicit meaning to the time between you raising an issue and it being answered or resolved.
@@ -392,7 +386,7 @@ See also: [OpenFaaS Pro](https://docs.openfaas.com/openfaas-pro/introduction/)
 
 ## License
 
-OpenFaaS Community Edition (CE) is licensed under the MIT License.
+All third-party contributions are licensed under the MIT license, all OpenFaaS Ltd contributions are licensed under the [OpenFaaS CE EULA](https://github.com/openfaas/faas/blob/master/EULA.md).
 
 OpenFaaS Standard and OpenFaaS for Enterprises are proprietary and binaries are licensed under the commercial [OpenFaaS Pro EULA](https://github.com/openfaas/faas/blob/master/pro/EULA.md).
 
diff --git a/LICENSE b/LICENSE
index fc538a181..1500b41f7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,14 @@
+All contributions from Alex Ellis & OpenFaaS Ltd are licensed under the
+OpenFaaS Community Edition (CE) EULA between the years 2017,2019-2024.
+
+Contributions from third-parties are licensed under the MIT license.
+
+A license is required for commercial use of OpenFaaS CE:
+https://github.com/openfaas/faas/blob/master/EULA.md
+
+A separate commercial license covering all contributions can be purchased
+from OpenFaaS Ltd, with details available at: https://openfaas.com/pricing
+
 MIT License
 
 Copyright (c) 2016-2018 Alex Ellis
diff --git a/README.md b/README.md
index 0baae32b3..17054f871 100644
--- a/README.md
+++ b/README.md
@@ -154,7 +154,7 @@ Have you written a blog about OpenFaaS? Do you have a speaking event? Send a Pul
 
 ### Contributing
 
-OpenFaaS Community Edition is written in Golang and contributions to the source code are made under the MIT license, additional restrictions may apply to OpenFaaS CE as a distribution. Various types of contributions are welcomed whether that means providing feedback, testing existing and new feature or hacking on the source code.
+OpenFaaS Community Edition is written in Golang. All third-party contributions to the source code are made under the MIT license, additional restrictions apply to OpenFaaS CE as a whole, where contributions from OpenFaaS Ltd are licensed under the [OpenFaaS CE EULA](EULA.md). Various types of contributions are welcomed whether that means providing feedback, testing existing and new feature or hacking on the source code.
 
 #### How do I become a contributor?
 
diff --git a/gateway/handlers/alerthandler.go b/gateway/handlers/alerthandler.go
index 795557ec2..d62cc4a17 100644
--- a/gateway/handlers/alerthandler.go
+++ b/gateway/handlers/alerthandler.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) Alex Ellis 2017. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
diff --git a/gateway/handlers/alerthandler_test.go b/gateway/handlers/alerthandler_test.go
index c9250d273..1dccfa073 100644
--- a/gateway/handlers/alerthandler_test.go
+++ b/gateway/handlers/alerthandler_test.go
@@ -1,5 +1,7 @@
-// Copyright (c) Alex Ellis 1017. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
+// Copyright (c) Alex Ellis 2017. All rights reserved.
 
 package handlers
 
diff --git a/gateway/handlers/callid_middleware.go b/gateway/handlers/callid_middleware.go
index 61a27259b..43154e8d4 100644
--- a/gateway/handlers/callid_middleware.go
+++ b/gateway/handlers/callid_middleware.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
diff --git a/gateway/handlers/cors.go b/gateway/handlers/cors.go
index 75b0c9437..e08b07f8e 100644
--- a/gateway/handlers/cors.go
+++ b/gateway/handlers/cors.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
diff --git a/gateway/handlers/cors_test.go b/gateway/handlers/cors_test.go
index 878410543..a3c0c07e1 100644
--- a/gateway/handlers/cors_test.go
+++ b/gateway/handlers/cors_test.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
diff --git a/gateway/handlers/forwarding_proxy.go b/gateway/handlers/forwarding_proxy.go
index d97f99bdd..c85b754f3 100644
--- a/gateway/handlers/forwarding_proxy.go
+++ b/gateway/handlers/forwarding_proxy.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
diff --git a/gateway/handlers/forwarding_proxy_test.go b/gateway/handlers/forwarding_proxy_test.go
index c8e756c9d..19bff3ec7 100644
--- a/gateway/handlers/forwarding_proxy_test.go
+++ b/gateway/handlers/forwarding_proxy_test.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
diff --git a/gateway/handlers/healthhandler.go b/gateway/handlers/healthhandler.go
index 9dff0af87..ecccec253 100644
--- a/gateway/handlers/healthhandler.go
+++ b/gateway/handlers/healthhandler.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s) 2019. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
diff --git a/gateway/handlers/infohandler.go b/gateway/handlers/infohandler.go
index 932f35c39..47b03e502 100644
--- a/gateway/handlers/infohandler.go
+++ b/gateway/handlers/infohandler.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
diff --git a/gateway/handlers/namespaces_test.go b/gateway/handlers/namespaces_test.go
index ba2d23eba..6df219f52 100644
--- a/gateway/handlers/namespaces_test.go
+++ b/gateway/handlers/namespaces_test.go
@@ -1,11 +1,14 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) Alex Ellis 2017. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
 import (
-	"github.com/openfaas/faas/gateway/pkg/middleware"
 	"testing"
+
+	"github.com/openfaas/faas/gateway/pkg/middleware"
 )
 
 func Test_getNamespace_Default(t *testing.T) {
diff --git a/gateway/handlers/notifier_handler.go b/gateway/handlers/notifier_handler.go
index d37d90e5e..fb45f7362 100644
--- a/gateway/handlers/notifier_handler.go
+++ b/gateway/handlers/notifier_handler.go
@@ -1,5 +1,10 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s) 2018. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
diff --git a/gateway/handlers/notifier_wrapper_test.go b/gateway/handlers/notifier_wrapper_test.go
index bb8bea65d..b52fafce3 100644
--- a/gateway/handlers/notifier_wrapper_test.go
+++ b/gateway/handlers/notifier_wrapper_test.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s) 2018. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
diff --git a/gateway/handlers/queue_proxy.go b/gateway/handlers/queue_proxy.go
index 13c2b67c5..df9828dae 100644
--- a/gateway/handlers/queue_proxy.go
+++ b/gateway/handlers/queue_proxy.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) Alex Ellis 2017. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
diff --git a/gateway/handlers/queue_proxy_test.go b/gateway/handlers/queue_proxy_test.go
index a5c8ee3c5..f6afcd386 100644
--- a/gateway/handlers/queue_proxy_test.go
+++ b/gateway/handlers/queue_proxy_test.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) Alex Ellis 2017. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
diff --git a/gateway/handlers/scaling.go b/gateway/handlers/scaling.go
index 4d0abd25b..58ed4948c 100644
--- a/gateway/handlers/scaling.go
+++ b/gateway/handlers/scaling.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package handlers
 
diff --git a/gateway/main.go b/gateway/main.go
index 6d1167836..5071b1d56 100644
--- a/gateway/main.go
+++ b/gateway/main.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) Alex Ellis 2017. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package main
 
diff --git a/gateway/metrics/exporter.go b/gateway/metrics/exporter.go
index 438401618..ac663c9c7 100644
--- a/gateway/metrics/exporter.go
+++ b/gateway/metrics/exporter.go
@@ -1,6 +1,8 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) Alex Ellis 2017
 // Copyright (c) 2018 OpenFaaS Author(s)
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package metrics
 
diff --git a/gateway/metrics/metrics.go b/gateway/metrics/metrics.go
index f8cb7ca4d..eca6bcee3 100644
--- a/gateway/metrics/metrics.go
+++ b/gateway/metrics/metrics.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) Alex Ellis 2017. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package metrics
 
diff --git a/gateway/pkg/middleware/baseurlresolver_test.go b/gateway/pkg/middleware/baseurlresolver_test.go
index 0924060d2..711219bf7 100644
--- a/gateway/pkg/middleware/baseurlresolver_test.go
+++ b/gateway/pkg/middleware/baseurlresolver_test.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package middleware
 
diff --git a/gateway/pkg/middleware/basic_auth_injector.go b/gateway/pkg/middleware/basic_auth_injector.go
index 81e628379..c10c7a1d5 100644
--- a/gateway/pkg/middleware/basic_auth_injector.go
+++ b/gateway/pkg/middleware/basic_auth_injector.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package middleware
 
diff --git a/gateway/pkg/middleware/basic_auth_injector_test.go b/gateway/pkg/middleware/basic_auth_injector_test.go
index f844d11f1..23d9b0e76 100644
--- a/gateway/pkg/middleware/basic_auth_injector_test.go
+++ b/gateway/pkg/middleware/basic_auth_injector_test.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package middleware
 
diff --git a/gateway/pkg/middleware/function_prefix_trimming_url_path_transformer_test.go b/gateway/pkg/middleware/function_prefix_trimming_url_path_transformer_test.go
index 6dfd644ad..f8af6f6de 100644
--- a/gateway/pkg/middleware/function_prefix_trimming_url_path_transformer_test.go
+++ b/gateway/pkg/middleware/function_prefix_trimming_url_path_transformer_test.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package middleware
 
diff --git a/gateway/pkg/middleware/transparent_url_path_transformer_test.go b/gateway/pkg/middleware/transparent_url_path_transformer_test.go
index 47162f3fb..6b3a2958f 100644
--- a/gateway/pkg/middleware/transparent_url_path_transformer_test.go
+++ b/gateway/pkg/middleware/transparent_url_path_transformer_test.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package middleware
 
diff --git a/gateway/plugin/external.go b/gateway/plugin/external.go
index 336f7c344..5b9fead78 100644
--- a/gateway/plugin/external.go
+++ b/gateway/plugin/external.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) Alex Ellis 2017. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package plugin
 
diff --git a/gateway/requests/prometheus.go b/gateway/requests/prometheus.go
index 1bb41f7b3..c69d2e2eb 100644
--- a/gateway/requests/prometheus.go
+++ b/gateway/requests/prometheus.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) Alex Ellis 2017. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package requests
 
diff --git a/gateway/requests/prometheus_test.go b/gateway/requests/prometheus_test.go
index 66e08ea61..1eb19184d 100644
--- a/gateway/requests/prometheus_test.go
+++ b/gateway/requests/prometheus_test.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) Alex Ellis 2017. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package requests
 
diff --git a/gateway/scaling/function_cache.go b/gateway/scaling/function_cache.go
index 4fe2a6622..d6ce03e03 100644
--- a/gateway/scaling/function_cache.go
+++ b/gateway/scaling/function_cache.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package scaling
 
diff --git a/gateway/scaling/function_cache_test.go b/gateway/scaling/function_cache_test.go
index a075325e7..7f6348142 100644
--- a/gateway/scaling/function_cache_test.go
+++ b/gateway/scaling/function_cache_test.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package scaling
 
diff --git a/gateway/scaling/function_meta.go b/gateway/scaling/function_meta.go
index 73d0576d9..cf807e407 100644
--- a/gateway/scaling/function_meta.go
+++ b/gateway/scaling/function_meta.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package scaling
 
diff --git a/gateway/scaling/function_query.go b/gateway/scaling/function_query.go
index c049e9e22..0ebafd6f1 100644
--- a/gateway/scaling/function_query.go
+++ b/gateway/scaling/function_query.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package scaling
 
diff --git a/gateway/scaling/service_query.go b/gateway/scaling/service_query.go
index 7d60e61bd..41705123d 100644
--- a/gateway/scaling/service_query.go
+++ b/gateway/scaling/service_query.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s). All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package scaling
 
diff --git a/gateway/types/proxy_client.go b/gateway/types/proxy_client.go
index 9ed1e629f..2cf9997c2 100644
--- a/gateway/types/proxy_client.go
+++ b/gateway/types/proxy_client.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) OpenFaaS Author(s) 2018. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package types
 
diff --git a/gateway/types/readconfig.go b/gateway/types/readconfig.go
index 4b93dbe38..b25c2b193 100644
--- a/gateway/types/readconfig.go
+++ b/gateway/types/readconfig.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) Alex Ellis 2017. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package types
 
diff --git a/gateway/types/readconfig_test.go b/gateway/types/readconfig_test.go
index 29390c00e..3505f037a 100644
--- a/gateway/types/readconfig_test.go
+++ b/gateway/types/readconfig_test.go
@@ -1,5 +1,7 @@
+// License: OpenFaaS Community Edition (CE) EULA
+// Copyright (c) 2017,2019-2024 OpenFaaS Author(s)
+
 // Copyright (c) Alex Ellis 2017. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 package types