diff --git a/.ci/.e2e-tests-for-elastic-agent.yaml b/.ci/.e2e-tests-for-elastic-agent.yaml
index b657134c1a..227315c7e5 100644
--- a/.ci/.e2e-tests-for-elastic-agent.yaml
+++ b/.ci/.e2e-tests-for-elastic-agent.yaml
@@ -4,14 +4,14 @@ SUITES:
     platforms:
       - labels: "arm64"
       - labels: "ubuntu-18.04"
-        provider: "elastic-package"
+        provider: "docker"
     scenarios:
       - name: "Fleet"
         pullRequestFilter: " && ~debian"
         tags: "fleet_mode_agent"
         platforms:
           - labels: "ubuntu-18.04"
-            provider: "elastic-package"
+            provider: "docker"
       - name: "Integrations"
         pullRequestFilter: " && ~debian"
         tags: "integrations"
@@ -27,13 +27,13 @@ SUITES:
       - name: "System Integration"
         platforms:
           - labels: "ubuntu-18.04"
-            provider: "elastic-package"
+            provider: "docker"
         pullRequestFilter: " && ~debian"
         tags: "system_integration"
       - name: "Stand-alone"
         platforms:
           - labels: "ubuntu-18.04"
-            provider: "elastic-package"
+            provider: "docker"
         pullRequestFilter: " && ~ubi8"
         tags: "stand_alone_agent"
       - name: "Backend Processes"
diff --git a/.ci/.e2e-tests.yaml b/.ci/.e2e-tests.yaml
index e647d3b873..fd01de12dc 100644
--- a/.ci/.e2e-tests.yaml
+++ b/.ci/.e2e-tests.yaml
@@ -14,16 +14,16 @@ SUITES:
     platforms:
       - labels: "arm64"
       - labels: "ubuntu-18.04"
-        provider: "elastic-package"
+        provider: "docker"
     scenarios:
       - name: "Fleet"
         pullRequestFilter: " && ~debian"
         tags: "fleet_mode_agent"
         platforms:
           - labels: "ubuntu-18.04"
-            provider: "elastic-package"
+            provider: "docker"
           - labels: "windows-2019"
-            provider: "elastic-package"
+            provider: "docker"
       - name: "Integrations"
         pullRequestFilter: " && ~debian"
         tags: "integrations"
@@ -42,13 +42,13 @@ SUITES:
       - name: "System Integration"
         platforms:
           - labels: "ubuntu-18.04"
-            provider: "elastic-package"
+            provider: "docker"
         pullRequestFilter: " && ~debian"
         tags: "system_integration"
       - name: "Stand-alone"
         platforms:
           - labels: "ubuntu-18.04"
-            provider: "elastic-package"
+            provider: "docker"
         pullRequestFilter: " && ~ubi8"
         tags: "stand_alone_agent"
       - name: "Backend Processes"
diff --git a/internal/deploy/base_test.go b/internal/deploy/base_test.go
index adf9b99ecd..482a70448e 100644
--- a/internal/deploy/base_test.go
+++ b/internal/deploy/base_test.go
@@ -11,6 +11,54 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func Test_New(t *testing.T) {
+	t.Run("New Docker Provider", func(t *testing.T) {
+		provider := New("docker")
+
+		s, ok := provider.(Deployment)
+		assert.True(t, ok, "Provider is not a Deployment")
+
+		s, ok = s.(*dockerDeploymentManifest)
+		assert.True(t, ok, "Provider is not Docker")
+	})
+
+	t.Run("New Elastic Package Provider", func(t *testing.T) {
+		provider := New("elastic-package")
+
+		s, ok := provider.(Deployment)
+		assert.True(t, ok, "Provider is not a Deployment")
+
+		s, ok = s.(*EPServiceManager)
+		assert.True(t, ok, "Provider is not Elastic Package")
+	})
+
+	t.Run("New K8S Provider", func(t *testing.T) {
+		provider := New("kubernetes")
+
+		s, ok := provider.(Deployment)
+		assert.True(t, ok, "Provider is not a Deployment")
+
+		s, ok = s.(*kubernetesDeploymentManifest)
+		assert.True(t, ok, "Provider is not Kubernetes")
+	})
+
+	t.Run("New Remote Provider", func(t *testing.T) {
+		provider := New("remote")
+
+		s, ok := provider.(Deployment)
+		assert.True(t, ok, "Provider is not a Deployment")
+
+		s, ok = s.(*remoteDeploymentManifest)
+		assert.True(t, ok, "Provider is not Remote")
+	})
+
+	t.Run("New Not Found Provider", func(t *testing.T) {
+		provider := New("asdf")
+
+		assert.Nil(t, provider, "Provider is not Nil")
+	})
+}
+
 func Test_ServiceRequest_GetName(t *testing.T) {
 	t.Run("ServiceRequest without flavour", func(t *testing.T) {
 		srv := NewServiceRequest("foo")