diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt
index 23286dd33..09f205434 100644
--- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt
+++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt
@@ -5712,12 +5712,6 @@ Octopus.Client.Model.DeploymentProcess
 }
 Octopus.Client.Model.Endpoints
 {
-  abstract class AgentlessEndpointResource
-    Octopus.Client.Extensibility.IResource
-    Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.EndpointResource
-  {
-  }
   AzureServiceFabricCredentialType
   {
       ClientCredential = 0
@@ -5732,7 +5726,7 @@ Octopus.Client.Model.Endpoints
   class AzureWebAppEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     String AccountId { get; set; }
@@ -5750,7 +5744,7 @@ Octopus.Client.Model.Endpoints
   class CloudRegionEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     Octopus.Client.Model.CommunicationStyle CommunicationStyle { get; }
@@ -5759,7 +5753,7 @@ Octopus.Client.Model.Endpoints
   class CloudServiceEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     String AccountId { get; set; }
@@ -5809,7 +5803,7 @@ Octopus.Client.Model.Endpoints
   class KubernetesEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     Octopus.Client.Model.Endpoints.IEndpointWithMultipleAuthenticationResource Authentication { get; set; }
@@ -5855,7 +5849,7 @@ Octopus.Client.Model.Endpoints
   class OfflineDropEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     String ApplicationsDirectory { get; set; }
@@ -5876,7 +5870,7 @@ Octopus.Client.Model.Endpoints
   class ServiceFabricEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     String AadClientCredentialSecret { get; set; }
@@ -5895,7 +5889,7 @@ Octopus.Client.Model.Endpoints
   class SshEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     String AccountId { get; set; }
diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt
index f370cbb11..a9e97e3d8 100644
--- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt
+++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt
@@ -5737,12 +5737,6 @@ Octopus.Client.Model.DeploymentProcess
 }
 Octopus.Client.Model.Endpoints
 {
-  abstract class AgentlessEndpointResource
-    Octopus.Client.Extensibility.IResource
-    Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.EndpointResource
-  {
-  }
   AzureServiceFabricCredentialType
   {
       ClientCredential = 0
@@ -5757,7 +5751,7 @@ Octopus.Client.Model.Endpoints
   class AzureWebAppEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     String AccountId { get; set; }
@@ -5775,7 +5769,7 @@ Octopus.Client.Model.Endpoints
   class CloudRegionEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     Octopus.Client.Model.CommunicationStyle CommunicationStyle { get; }
@@ -5784,7 +5778,7 @@ Octopus.Client.Model.Endpoints
   class CloudServiceEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     String AccountId { get; set; }
@@ -5834,7 +5828,7 @@ Octopus.Client.Model.Endpoints
   class KubernetesEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     Octopus.Client.Model.Endpoints.IEndpointWithMultipleAuthenticationResource Authentication { get; set; }
@@ -5880,7 +5874,7 @@ Octopus.Client.Model.Endpoints
   class OfflineDropEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     String ApplicationsDirectory { get; set; }
@@ -5901,7 +5895,7 @@ Octopus.Client.Model.Endpoints
   class ServiceFabricEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     String AadClientCredentialSecret { get; set; }
@@ -5920,7 +5914,7 @@ Octopus.Client.Model.Endpoints
   class SshEndpointResource
     Octopus.Client.Extensibility.IResource
     Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.AgentlessEndpointResource
+    Octopus.Client.Model.Endpoints.EndpointResource
   {
     .ctor()
     String AccountId { get; set; }
diff --git a/source/Octopus.Client/Model/Endpoints/AgentlessEndpointResource.cs b/source/Octopus.Client/Model/Endpoints/AgentlessEndpointResource.cs
deleted file mode 100644
index 6cee021bf..000000000
--- a/source/Octopus.Client/Model/Endpoints/AgentlessEndpointResource.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace Octopus.Client.Model.Endpoints
-{
-    public abstract class AgentlessEndpointResource : EndpointResource
-    {
-    }
-}
\ No newline at end of file
diff --git a/source/Octopus.Client/Model/Endpoints/AzureWebAppEndpointResource.cs b/source/Octopus.Client/Model/Endpoints/AzureWebAppEndpointResource.cs
index 0ec156cf5..46d3c9203 100644
--- a/source/Octopus.Client/Model/Endpoints/AzureWebAppEndpointResource.cs
+++ b/source/Octopus.Client/Model/Endpoints/AzureWebAppEndpointResource.cs
@@ -4,7 +4,7 @@
 
 namespace Octopus.Client.Model.Endpoints
 {
-    public class AzureWebAppEndpointResource : AgentlessEndpointResource
+    public class AzureWebAppEndpointResource : EndpointResource
     {
         public override CommunicationStyle CommunicationStyle
         {
diff --git a/source/Octopus.Client/Model/Endpoints/CloudRegionEndpointResource.cs b/source/Octopus.Client/Model/Endpoints/CloudRegionEndpointResource.cs
index e421c5f04..1ac75245c 100644
--- a/source/Octopus.Client/Model/Endpoints/CloudRegionEndpointResource.cs
+++ b/source/Octopus.Client/Model/Endpoints/CloudRegionEndpointResource.cs
@@ -2,7 +2,7 @@
 
 namespace Octopus.Client.Model.Endpoints
 {
-    public class CloudRegionEndpointResource : AgentlessEndpointResource
+    public class CloudRegionEndpointResource : EndpointResource
     {
         public override CommunicationStyle CommunicationStyle => CommunicationStyle.None;
 
diff --git a/source/Octopus.Client/Model/Endpoints/CloudServiceEndpointResource.cs b/source/Octopus.Client/Model/Endpoints/CloudServiceEndpointResource.cs
index 863149f8b..3d47ffbf6 100644
--- a/source/Octopus.Client/Model/Endpoints/CloudServiceEndpointResource.cs
+++ b/source/Octopus.Client/Model/Endpoints/CloudServiceEndpointResource.cs
@@ -4,7 +4,7 @@
 
 namespace Octopus.Client.Model.Endpoints
 {
-    public class CloudServiceEndpointResource : AgentlessEndpointResource
+    public class CloudServiceEndpointResource : EndpointResource
     {
         public override CommunicationStyle CommunicationStyle
         {
diff --git a/source/Octopus.Client/Model/Endpoints/KubernetesEndpointResource.cs b/source/Octopus.Client/Model/Endpoints/KubernetesEndpointResource.cs
index c3af288a1..c21334d9c 100644
--- a/source/Octopus.Client/Model/Endpoints/KubernetesEndpointResource.cs
+++ b/source/Octopus.Client/Model/Endpoints/KubernetesEndpointResource.cs
@@ -2,7 +2,7 @@
 
 namespace Octopus.Client.Model.Endpoints
 {
-    public class KubernetesEndpointResource : AgentlessEndpointResource
+    public class KubernetesEndpointResource : EndpointResource
     {
         public override CommunicationStyle CommunicationStyle => CommunicationStyle.Kubernetes;
 
diff --git a/source/Octopus.Client/Model/Endpoints/OfflineDropEndpointResource.cs b/source/Octopus.Client/Model/Endpoints/OfflineDropEndpointResource.cs
index 86cc8f1f8..2a67432fe 100644
--- a/source/Octopus.Client/Model/Endpoints/OfflineDropEndpointResource.cs
+++ b/source/Octopus.Client/Model/Endpoints/OfflineDropEndpointResource.cs
@@ -7,7 +7,7 @@
 
 namespace Octopus.Client.Model.Endpoints
 {
-    public class OfflineDropEndpointResource : AgentlessEndpointResource
+    public class OfflineDropEndpointResource : EndpointResource
     {
         public OfflineDropEndpointResource()
         {
diff --git a/source/Octopus.Client/Model/Endpoints/ServiceFabricEndpointResource.cs b/source/Octopus.Client/Model/Endpoints/ServiceFabricEndpointResource.cs
index 49df3de63..9e846aa09 100644
--- a/source/Octopus.Client/Model/Endpoints/ServiceFabricEndpointResource.cs
+++ b/source/Octopus.Client/Model/Endpoints/ServiceFabricEndpointResource.cs
@@ -2,7 +2,7 @@
 
 namespace Octopus.Client.Model.Endpoints
 {
-    public class ServiceFabricEndpointResource : AgentlessEndpointResource
+    public class ServiceFabricEndpointResource : EndpointResource
     {
         public override CommunicationStyle CommunicationStyle => CommunicationStyle.AzureServiceFabricCluster;
 
diff --git a/source/Octopus.Client/Model/Endpoints/SshEndpointResource.cs b/source/Octopus.Client/Model/Endpoints/SshEndpointResource.cs
index fce7037f3..23977cb0d 100644
--- a/source/Octopus.Client/Model/Endpoints/SshEndpointResource.cs
+++ b/source/Octopus.Client/Model/Endpoints/SshEndpointResource.cs
@@ -3,7 +3,7 @@
 
 namespace Octopus.Client.Model.Endpoints
 {
-    public class SshEndpointResource : AgentlessEndpointResource
+    public class SshEndpointResource : EndpointResource
     {
         public override CommunicationStyle CommunicationStyle
         {