diff --git a/go.mod b/go.mod
index 5752e54accd1..3e1d23e168ed 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/containernetworking/plugins v1.9.0
 	github.com/emicklei/go-restful/v3 v3.13.0
 	github.com/envoyproxy/go-control-plane v0.14.0
-	github.com/envoyproxy/go-control-plane/contrib v1.32.4
+	github.com/envoyproxy/go-control-plane/contrib v1.36.0
 	github.com/envoyproxy/go-control-plane/envoy v1.36.0
 	github.com/envoyproxy/protoc-gen-validate v1.3.0
 	github.com/evanphx/json-patch/v5 v5.9.11
@@ -297,8 +297,8 @@ require (
 )
 
 replace (
-	github.com/envoyproxy/go-control-plane => github.com/kumahq/go-control-plane v0.14.0-kong-1
-	github.com/envoyproxy/go-control-plane/contrib => github.com/kumahq/go-control-plane/contrib v1.36.0-kong-1
-	github.com/envoyproxy/go-control-plane/envoy => github.com/kumahq/go-control-plane/envoy v1.36.0-kong-1
-	github.com/envoyproxy/go-control-plane/ratelimit => github.com/kumahq/go-control-plane/ratelimit v0.1.0-kong-1
+	github.com/envoyproxy/go-control-plane => github.com/kumahq/go-control-plane v0.14.0
+	github.com/envoyproxy/go-control-plane/contrib => github.com/kumahq/go-control-plane/contrib v1.36.0
+	github.com/envoyproxy/go-control-plane/envoy => github.com/kumahq/go-control-plane/envoy v1.36.0
+	github.com/envoyproxy/go-control-plane/ratelimit => github.com/kumahq/go-control-plane/ratelimit v0.1.0
 )
diff --git a/go.sum b/go.sum
index 60bbf21c2bfe..1b004fea3606 100644
--- a/go.sum
+++ b/go.sum
@@ -341,14 +341,14 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kumahq/go-control-plane v0.14.0-kong-1 h1:TgRksOBpxxCRyCIliCzrDYF6QEcMrNfZ0djYlfy4AVs=
-github.com/kumahq/go-control-plane v0.14.0-kong-1/go.mod h1:NcS5X47pLl/hfqxU70yPwL9ZMkUlwlKxtAohpi2wBEU=
-github.com/kumahq/go-control-plane/contrib v1.36.0-kong-1 h1:D9emSea8PDMB4DnnZHB73+vNYbLyLKCI+Iq6pk0ka+c=
-github.com/kumahq/go-control-plane/contrib v1.36.0-kong-1/go.mod h1:hrW0JVqPKr6+o5MGX5i/0b1rjuJ2PF/vN0Yv4v3XToA=
-github.com/kumahq/go-control-plane/envoy v1.36.0-kong-1 h1:XYPk4BQ4uLocMk8dVmY/dTvz7cg8kax57xgNdfK0otk=
-github.com/kumahq/go-control-plane/envoy v1.36.0-kong-1/go.mod h1:ty89S1YCCVruQAm9OtKeEkQLTb+Lkz0k8v9W0Oxsv98=
-github.com/kumahq/go-control-plane/ratelimit v0.1.0-kong-1 h1:sHL3hEDiKPyzRYc4A9ADYGHLmUNt/AX+Ns3t5BeS1WA=
-github.com/kumahq/go-control-plane/ratelimit v0.1.0-kong-1/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
+github.com/kumahq/go-control-plane v0.14.0 h1:fN2fIoBytFLyDM3TDvLFK/zSD8Z5YAw8cDoOLobZNwI=
+github.com/kumahq/go-control-plane v0.14.0/go.mod h1:NcS5X47pLl/hfqxU70yPwL9ZMkUlwlKxtAohpi2wBEU=
+github.com/kumahq/go-control-plane/contrib v1.36.0 h1:qK9JcIPofA1Q3qK/J3M3T8wbNou9XF8hkTGdJVBS76k=
+github.com/kumahq/go-control-plane/contrib v1.36.0/go.mod h1:hrW0JVqPKr6+o5MGX5i/0b1rjuJ2PF/vN0Yv4v3XToA=
+github.com/kumahq/go-control-plane/envoy v1.36.0 h1:E+Yi0Gj9cdrsxolp60GlHZdQNScYWj7lZ3vIqUx8AJ8=
+github.com/kumahq/go-control-plane/envoy v1.36.0/go.mod h1:ty89S1YCCVruQAm9OtKeEkQLTb+Lkz0k8v9W0Oxsv98=
+github.com/kumahq/go-control-plane/ratelimit v0.1.0 h1:GgXxjOUcHYqjqFoNctwYzYVABJ6FmncQZBeZIC9tKoU=
+github.com/kumahq/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=