diff --git a/ci/sync_envoy.sh b/ci/sync_envoy.sh
index 763f81d02b..38f1ca83a3 100755
--- a/ci/sync_envoy.sh
+++ b/ci/sync_envoy.sh
@@ -40,9 +40,9 @@ sync_protos () {
     echo "Syncing go protos ..."
     for src in "${SRCS[@]}"; do
         envoy_src="${ENVOY_SRC_DIR}/build_go/${src}"
-        rm -rf "$src"
-        echo "Copying ${envoy_src} -> ${src}"
-        cp -a "$envoy_src" "$src"
+        find "${src}" ! -name "${src}" -maxdepth 1 -type d -exec rm -rf {} +
+        echo "Copying ${envoy_src}/* -> ${src}"
+        cp -a "$envoy_src"/* "$src"
         git add "$src"
     done
     make tidy-all
diff --git a/envoy/empty.go b/envoy/empty.go
new file mode 100644
index 0000000000..c333e32a63
--- /dev/null
+++ b/envoy/empty.go
@@ -0,0 +1,4 @@
+package envoy
+
+// Used to resolve import issues related to go-control-plane package split
+import _ "github.com/envoyproxy/go-control-plane/pkg/cache/v3"
diff --git a/envoy/go.mod b/envoy/go.mod
index d059c78eb1..69bd3e0172 100644
--- a/envoy/go.mod
+++ b/envoy/go.mod
@@ -2,8 +2,12 @@ module github.com/envoyproxy/go-control-plane/envoy
 
 go 1.22
 
+// Used to resolve import issues related to go-control-plane package split (https://github.com/envoyproxy/go-control-plane/issues/1074)
+replace github.com/envoyproxy/go-control-plane@v0.13.3 => ../
+
 require (
 	github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20
+	github.com/envoyproxy/go-control-plane v0.13.3
 	github.com/envoyproxy/protoc-gen-validate v1.1.0
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10
 	github.com/prometheus/client_model v0.6.0
diff --git a/envoy/go.sum b/envoy/go.sum
index 1e5170e18e..2a7f9c61f1 100644
--- a/envoy/go.sum
+++ b/envoy/go.sum
@@ -2,14 +2,22 @@ cel.dev/expr v0.16.0 h1:yloc84fytn4zmJX2GU3TkXGsaieaV7dQ057Qs4sIG2Y=
 cel.dev/expr v0.16.0/go.mod h1:TRSuuV7DlVCE/uwv5QbAiW/v8l5O8C4eEPHeu7gf7Sg=
 github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20 h1:N+3sFI5GUjRKBi+i0TxYVST9h4Ie192jJWpHvthBBgg=
 github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.13.3 h1:F2vYcSF8iRNhfvhZQRZ5Dvuyu0TpXazE9+h53TzkvA4=
+github.com/envoyproxy/go-control-plane v0.13.3/go.mod h1:uhvHSBAMSvy2Y+CuAYfByIRH19zcdir1rgmMzKUo3eA=
 github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM=
 github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos=
 github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
 go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
 golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
@@ -26,3 +34,5 @@ google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
 google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
 google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
 google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/examples/dyplomat/go.mod b/examples/dyplomat/go.mod
index d0f75e84ae..83e09f3c67 100644
--- a/examples/dyplomat/go.mod
+++ b/examples/dyplomat/go.mod
@@ -9,7 +9,7 @@ replace (
 )
 
 require (
-	github.com/envoyproxy/go-control-plane v0.13.1
+	github.com/envoyproxy/go-control-plane v0.13.3
 	github.com/envoyproxy/go-control-plane/envoy v1.32.2
 	google.golang.org/grpc v1.69.2
 	gopkg.in/yaml.v2 v2.4.0
diff --git a/internal/tools/go.mod b/internal/tools/go.mod
index e044a1d2ae..d14b7e2713 100644
--- a/internal/tools/go.mod
+++ b/internal/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/go-control-plane/internal/tools
 
-go 1.22.1
+go 1.22
 
 require (
 	github.com/golangci/golangci-lint v1.62.2