diff --git a/go.mod b/go.mod
index 99378e7dc8..9fe13281e8 100644
--- a/go.mod
+++ b/go.mod
@@ -183,7 +183,6 @@ require (
 	golang.org/x/term v0.35.0 // indirect
 	golang.org/x/text v0.29.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
-	golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
 	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
@@ -202,3 +201,5 @@ require (
 	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 	sigs.k8s.io/yaml v1.6.0 // indirect
 )
+
+replace github.com/elastic/package-spec/v3 => github.com/jsoriano/package-spec/v3 v3.0.0-20251007110543-e0845c9b6b98
diff --git a/go.sum b/go.sum
index 821147ae66..f6b6f56d29 100644
--- a/go.sum
+++ b/go.sum
@@ -132,8 +132,6 @@ github.com/elastic/gojsonschema v1.2.1 h1:cUMbgsz0wyEB4x7xf3zUEvUVDl6WCz2RKcQPul
 github.com/elastic/gojsonschema v1.2.1/go.mod h1:biw5eBS2Z4T02wjATMRSfecfjCmwaDPvuaqf844gLrg=
 github.com/elastic/kbncontent v0.1.4 h1:GoUkJkqkn2H6iJTnOHcxEqYVVYyjvcebLQVaSR1aSvU=
 github.com/elastic/kbncontent v0.1.4/go.mod h1:kOPREITK9gSJsiw/WKe7QWSO+PRiZMyEFQCw+CMLAHI=
-github.com/elastic/package-spec/v3 v3.5.0 h1:rvB+lWXXoUkSVx4TaHerV/eO6uN0NH1E5sPW1kW74Lk=
-github.com/elastic/package-spec/v3 v3.5.0/go.mod h1:dH//Q1geKx3fxC0lwPrVmnjN6RMqyDf5tnsw7trwqWE=
 github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU=
 github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -262,6 +260,8 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jsoriano/package-spec/v3 v3.0.0-20251007110543-e0845c9b6b98 h1:IdPZ6E8R2mI3O+BF+W1VbLPsTh+Lqs8S6MjgRKDRpnc=
+github.com/jsoriano/package-spec/v3 v3.0.0-20251007110543-e0845c9b6b98/go.mod h1:vWBPhVjiL8XoZ85lyCSMjKqSwzeb41zEmd6lElJsrk0=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
diff --git a/test/packages/parallel/httpcheck/_dev/test/policy/test-eprcheck.expected b/test/packages/parallel/httpcheck/_dev/test/policy/test-eprcheck.expected
index 715512ae1a..9ac9ac20d7 100644
--- a/test/packages/parallel/httpcheck/_dev/test/policy/test-eprcheck.expected
+++ b/test/packages/parallel/httpcheck/_dev/test/policy/test-eprcheck.expected
@@ -25,7 +25,7 @@ processors:
             - context: datapoint
               statements:
                 - set(attributes["data_stream.type"], "metrics")
-                - set(attributes["data_stream.dataset"], "httpcheck.check")
+                - set(attributes["data_stream.dataset"], "httpcheck.httpcheckreceiver")
                 - set(attributes["data_stream.namespace"], "ep")
 receivers:
     httpcheck/componentid-0:
diff --git a/test/packages/parallel/httpcheck/fields/base-fields.yml b/test/packages/parallel/httpcheck/fields/base-fields.yml
deleted file mode 100644
index 7c798f4534..0000000000
--- a/test/packages/parallel/httpcheck/fields/base-fields.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- name: data_stream.type
-  type: constant_keyword
-  description: Data stream type.
-- name: data_stream.dataset
-  type: constant_keyword
-  description: Data stream dataset.
-- name: data_stream.namespace
-  type: constant_keyword
-  description: Data stream namespace.
-- name: '@timestamp'
-  type: date
-  description: Event timestamp.
diff --git a/test/packages/parallel/httpcheck/manifest.yml b/test/packages/parallel/httpcheck/manifest.yml
index 20af460097..9d39df043c 100644
--- a/test/packages/parallel/httpcheck/manifest.yml
+++ b/test/packages/parallel/httpcheck/manifest.yml
@@ -26,7 +26,7 @@ icons:
     size: 32x32
     type: image/svg+xml
 policy_templates:
-  - name: check
+  - name: httpcheckreceiver
     type: metrics
     title: HTTP Check
     description: Perform HTTP checks and collect its results.
@@ -67,10 +67,6 @@ policy_templates:
         multi: true
         required: false
         show_user: false
-elasticsearch:
-  index_template:
-    mappings:
-      subobjects: false
 owner:
   github: elastic/ecosystem
   type: elastic