diff --git a/examples/serverless-agent/fargate/workload-legacy/README.md b/examples/serverless-agent/fargate/workload-legacy/README.md
new file mode 100644
index 00000000..a221da51
--- /dev/null
+++ b/examples/serverless-agent/fargate/workload-legacy/README.md
@@ -0,0 +1,30 @@
+# Workload with Serverless Workload Agent
+
+This example deploys a cluster with a workload and the Serverless Workload Agent as a sidecar to secure the workload.
+
+The Workload Agent will use an Orchestrator Agent as a proxy to the Sysdig Collector.
+
+## Prerequisites
+
+The following prerequisites are required to deploy this cluster:
+- Orchestrator Agent deployed
+- VPC
+- 2 subnets
+
+## Components
+
+The cluster will be called `<prefix>-instrumented-workload` and will deploy the following:
+- 1 Service (called `<prefix-instrumented-service`)
+  - 1 Task with 2 replicas, each running:
+    - 1 container named `event-gen-1` running `falcosecurity/event-generator`
+    - 1 container named `event-gen-2` also running `falcosecurity/event-generator`
+    - 1 container named `SysdigInstrumentation` running the latest Workload Agent which will secure both workload containers
+
+## Layout
+| **File** | **Purpose** |
+| --- | --- |
+| `instrumented_load.tf` | Workload definition. By default it instruments `falcosecurity/event-generator` |
+| `main.tf` | AWS provider configuration |
+| `output.tf` | Defines the output variables |
+| `variables.tf` | AWS and Agent configuration |
+| `versions.tf` | Defines TF provider versions |
diff --git a/examples/serverless-agent/fargate/workload-legacy/instrumented_load.tf b/examples/serverless-agent/fargate/workload-legacy/instrumented_load.tf
new file mode 100644
index 00000000..fe3307d0
--- /dev/null
+++ b/examples/serverless-agent/fargate/workload-legacy/instrumented_load.tf
@@ -0,0 +1,145 @@
+data "sysdig_fargate_workload_agent" "containers_instrumented" {
+  container_definitions = jsonencode([
+    {
+      "name" : "event-gen-1",
+      "image" : "falcosecurity/event-generator",
+      "command" : ["run", "syscall", "--all", "--loop"],
+      "logConfiguration" : {
+        "logDriver" : "awslogs",
+        "options" : {
+          "awslogs-group" : aws_cloudwatch_log_group.instrumented_logs.name,
+          "awslogs-region" : var.region,
+          "awslogs-stream-prefix" : "task"
+        },
+      }
+    },
+    {
+      "name" : "event-gen-2",
+      "image" : "falcosecurity/event-generator",
+      "command" : ["run", "syscall", "--all", "--loop"],
+      "logConfiguration" : {
+        "logDriver" : "awslogs",
+        "options" : {
+          "awslogs-group" : aws_cloudwatch_log_group.instrumented_logs.name,
+          "awslogs-region" : var.region,
+          "awslogs-stream-prefix" : "task"
+        },
+      }
+    }
+  ])
+
+  workload_agent_image = var.agent_workload_image
+
+  sysdig_access_key = var.access_key
+  orchestrator_host = var.orchestrator_host
+  orchestrator_port = var.orchestrator_port
+
+  log_configuration {
+    group         = aws_cloudwatch_log_group.instrumented_logs.name
+    stream_prefix = "instrumentation"
+    region        = var.region
+  }
+}
+
+resource "aws_ecs_task_definition" "task_definition" {
+  family             = "${var.prefix}-instrumented-task-definition"
+  task_role_arn      = aws_iam_role.task_role.arn
+  execution_role_arn = aws_iam_role.execution_role.arn
+
+  cpu                      = "256"
+  memory                   = "512"
+  network_mode             = "awsvpc"
+  requires_compatibilities = ["FARGATE"]
+  pid_mode                 = "task"
+
+  container_definitions = data.sysdig_fargate_workload_agent.containers_instrumented.output_container_definitions
+}
+
+
+resource "aws_ecs_cluster" "cluster" {
+  name = "${var.prefix}-instrumented-workload"
+}
+
+resource "aws_cloudwatch_log_group" "instrumented_logs" {
+}
+
+data "aws_iam_policy_document" "assume_role_policy" {
+  statement {
+    actions = ["sts:AssumeRole"]
+
+    principals {
+      type        = "Service"
+      identifiers = ["ecs-tasks.amazonaws.com"]
+    }
+  }
+}
+
+resource "aws_iam_role" "execution_role" {
+  assume_role_policy = data.aws_iam_policy_document.assume_role_policy.json
+
+  managed_policy_arns = ["arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy"]
+}
+
+resource "aws_iam_role" "task_role" {
+  assume_role_policy = data.aws_iam_policy_document.assume_role_policy.json
+
+  inline_policy {
+    name   = "root"
+    policy = data.aws_iam_policy_document.task_policy.json
+  }
+}
+
+data "aws_iam_policy_document" "task_policy" {
+  statement {
+    actions = [
+      "ecr:GetAuthorizationToken",
+      "ecr:BatchCheckLayerAvailability",
+      "ecr:GetDownloadUrlForLayer",
+      "ecr:BatchGetImage",
+      "logs:CreateLogGroup",
+      "logs:CreateLogStream",
+      "logs:PutLogEvents",
+    ]
+
+    resources = ["*"]
+  }
+}
+
+resource "aws_ecs_service" "service" {
+  name = "${var.prefix}-instrumented-service"
+
+  cluster          = aws_ecs_cluster.cluster.id
+  task_definition  = aws_ecs_task_definition.task_definition.arn
+  desired_count    = var.replicas
+  launch_type      = "FARGATE"
+  platform_version = "1.4.0"
+
+  network_configuration {
+    subnets          = [var.subnet_1, var.subnet_2]
+    security_groups  = [aws_security_group.security_group.id]
+    assign_public_ip = true
+  }
+}
+
+resource "aws_security_group" "security_group" {
+  description = "${var.prefix}-security-group"
+  vpc_id      = var.vpc_id
+}
+
+resource "aws_security_group_rule" "orchestrator_agent_ingress_rule" {
+  type              = "ingress"
+  protocol          = "tcp"
+  from_port         = 0
+  to_port           = 0
+  cidr_blocks       = ["0.0.0.0/0"]
+  security_group_id = aws_security_group.security_group.id
+}
+
+resource "aws_security_group_rule" "orchestrator_agent_egress_rule" {
+  type              = "egress"
+  protocol          = "all"
+  from_port         = 0
+  to_port           = 0
+  cidr_blocks       = ["0.0.0.0/0"]
+  security_group_id = aws_security_group.security_group.id
+}
diff --git a/examples/serverless-agent/fargate/workload-legacy/output.tf b/examples/serverless-agent/fargate/workload-legacy/output.tf
new file mode 100644
index 00000000..8556be22
--- /dev/null
+++ b/examples/serverless-agent/fargate/workload-legacy/output.tf
@@ -0,0 +1,15 @@
+output "workload_cluster_name" {
+  value = aws_ecs_cluster.cluster.name
+}
+
+output "workload_cluster_arn" {
+  value = aws_ecs_cluster.cluster.arn
+}
+
+output "service_arn" {
+  value = aws_ecs_service.service.id
+}
+
+output "task_revision" {
+  value = aws_ecs_task_definition.task_definition.revision
+}
diff --git a/examples/serverless-agent/fargate/workload-legacy/providers.tf b/examples/serverless-agent/fargate/workload-legacy/providers.tf
new file mode 100644
index 00000000..1305d94b
--- /dev/null
+++ b/examples/serverless-agent/fargate/workload-legacy/providers.tf
@@ -0,0 +1,4 @@
+provider "aws" {
+  region = var.region
+  profile = var.profile
+}
\ No newline at end of file
diff --git a/examples/serverless-agent/fargate/workload-legacy/variables.tf b/examples/serverless-agent/fargate/workload-legacy/variables.tf
new file mode 100644
index 00000000..6ec27216
--- /dev/null
+++ b/examples/serverless-agent/fargate/workload-legacy/variables.tf
@@ -0,0 +1,56 @@
+# AWS configuration
+variable "prefix" {
+  description = "All resources created by Terraform have this prefix prepended to them"
+}
+
+variable "profile" {
+  description = "AWS profile name"
+  type        = string
+}
+
+variable "region" {
+  description = "AWS Region for deployment"
+  default     = "us-east-1"
+}
+
+variable "subnet_1" {
+  description = "Subnet-1 Id"
+}
+
+variable "subnet_2" {
+  description = "Subnet-2 Id"
+}
+
+variable "vpc_id" {
+  description = "VPC Id"
+}
+
+variable "tags" {
+  type        = map(string)
+  description = "Tags to assign to resources in module"
+  default     = {}
+}
+
+variable "replicas" {
+  description = "Number of workload replicas to run"
+  default     = 2
+}
+
+# Serverless Agent Configuration
+variable "access_key" {
+  description = "Sysdig Agent access key"
+}
+
+variable "agent_workload_image" {
+  description = "Workload agent container image"
+  default     = "quay.io/sysdig/workload-agent:latest"
+}
+
+variable "orchestrator_host" {
+  description = "Orchestrator Host"
+}
+
+variable "orchestrator_port" {
+  description = "Orchestrator Port"
+  default     = 6667
+}
diff --git a/examples/serverless-agent/fargate/workload-legacy/versions.tf b/examples/serverless-agent/fargate/workload-legacy/versions.tf
new file mode 100644
index 00000000..37120d0a
--- /dev/null
+++ b/examples/serverless-agent/fargate/workload-legacy/versions.tf
@@ -0,0 +1,18 @@
+terraform {
+  required_version = ">=1.7.2"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.35.0"
+    }
+    local = {
+      source  = "hashicorp/local"
+      version = "~> 2.4.1"
+    }
+    sysdig = {
+      source  = "sysdiglabs/sysdig"
+      version = "~> 1.24.5"
+    }
+  }
+}
\ No newline at end of file
diff --git a/examples/serverless-agent/fargate/workload/README.md b/examples/serverless-agent/fargate/workload/README.md
index f5b79e87..36267446 100644
--- a/examples/serverless-agent/fargate/workload/README.md
+++ b/examples/serverless-agent/fargate/workload/README.md
@@ -2,10 +2,11 @@
 
 This example deploys a cluster with a workload and the Serverless Workload Agent as a sidecar to secure the workload.
 
+The Workload Agent will directly connect to the Sysdig Collector.
+
 ## Prerequisites
 
 The following prerequisites are required to deploy this cluster:
-- Orchestrator Agent deployed
 - VPC
 - 2 subnets
 
@@ -13,10 +14,10 @@ The following prerequisites are required to deploy this cluster:
 
 The cluster will be called `<prefix>-instrumented-workload` and will deploy the following:
 - 1 Service (called `<prefix-instrumented-service`)
-  - 1 Task (with the latest version of the Serverless Orchestrator Agent)
+  - 1 Task with 2 replicas, each running:
     - 1 container named `event-gen-1` running `falcosecurity/event-generator`
     - 1 container named `event-gen-2` also running `falcosecurity/event-generator`
-    - 1 container named `SysdigInstrumentation` running the Workload Agent which will secure both workload containers
+    - 1 container named `SysdigInstrumentation` running the latest Workload Agent which will secure both workload containers
 
 ## Layout
 | **File** | **Purpose** |
diff --git a/examples/serverless-agent/fargate/workload/instrumented_load.tf b/examples/serverless-agent/fargate/workload/instrumented_load.tf
index fe3307d0..0b6f1370 100644
--- a/examples/serverless-agent/fargate/workload/instrumented_load.tf
+++ b/examples/serverless-agent/fargate/workload/instrumented_load.tf
@@ -31,8 +31,8 @@ data "sysdig_fargate_workload_agent" "containers_instrumented" {
   workload_agent_image = var.agent_workload_image
 
   sysdig_access_key = var.access_key
-  orchestrator_host = var.orchestrator_host
-  orchestrator_port = var.orchestrator_port
+  collector_host    = var.collector_host
+  collector_port    = var.collector_port
 
   log_configuration {
     group         = aws_cloudwatch_log_group.instrumented_logs.name
diff --git a/examples/serverless-agent/fargate/workload/variables.tf b/examples/serverless-agent/fargate/workload/variables.tf
index bcdafe43..ba6abf0c 100644
--- a/examples/serverless-agent/fargate/workload/variables.tf
+++ b/examples/serverless-agent/fargate/workload/variables.tf
@@ -31,6 +31,11 @@ variable "tags" {
   default     = {}
 }
 
+variable "replicas" {
+  description = "Number of workload replicas to run"
+  default     = 2
+}
+
 # Serverless Agent Configuration
 variable "access_key" {
   description = "Sysdig Agent access key"
@@ -41,16 +46,11 @@ variable "agent_workload_image" {
   default     = "quay.io/sysdig/workload-agent:latest"
 }
 
-variable "orchestrator_host" {
-  description = "Orchestrator Host"
+variable "collector_host" {
+  description = "Collector Host"
 }
 
-variable "orchestrator_port" {
-  description = "Orchestrator Port"
-  default     = 6667
-}
-
-variable "replicas" {
-  description = "Number of workload replicas to run"
-  default     = 2
+variable "collector_port" {
+  description = "Collector Port"
+  default     = 6443
 }
diff --git a/sysdig/data_source_sysdig_monitor_notification_channel_ibm_function_test.go b/sysdig/data_source_sysdig_monitor_notification_channel_ibm_function_test.go
deleted file mode 100644
index 98e2243a..00000000
--- a/sysdig/data_source_sysdig_monitor_notification_channel_ibm_function_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-//go:build tf_acc_sysdig_monitor || tf_acc_ibm_monitor || tf_acc_onprem_monitor
-
-package sysdig_test
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-
-	"github.com/draios/terraform-provider-sysdig/sysdig"
-)
-
-func TestAccMonitorNotificationChannelIBMFunctionDataSource(t *testing.T) {
-	rText := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck: sysdigOrIBMMonitorPreCheck(t),
-		ProviderFactories: map[string]func() (*schema.Provider, error){
-			"sysdig": func() (*schema.Provider, error) {
-				return sysdig.Provider(), nil
-			},
-		},
-		Steps: []resource.TestStep{
-			{
-				Config: monitorNotificationChannelIBMFunction(rText),
-				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttrPair("data.sysdig_monitor_notification_channel_ibm_function.nc_ibm_function", "id", "sysdig_monitor_notification_channel_ibm_function.nc_ibm_function", "id"),
-					resource.TestCheckResourceAttrPair("data.sysdig_monitor_notification_channel_ibm_function.nc_ibm_function", "name", "sysdig_monitor_notification_channel_ibm_function.nc_ibm_function", "name"),
-					resource.TestCheckResourceAttrPair("data.sysdig_monitor_notification_channel_ibm_function.nc_ibm_function", "ibm_function_type", "sysdig_monitor_notification_channel_ibm_function.nc_ibm_function", "ibm_function_type"),
-					resource.TestCheckResourceAttrPair("data.sysdig_monitor_notification_channel_ibm_function.nc_ibm_function", "url", "sysdig_monitor_notification_channel_ibm_function.nc_ibm_function", "url"),
-					resource.TestCheckResourceAttrPair("data.sysdig_monitor_notification_channel_ibm_function.nc_ibm_function", "whisk_auth_token", "sysdig_monitor_notification_channel_ibm_function.nc_ibm_function", "whisk_auth_token"),
-				),
-			},
-		},
-	})
-}
-
-func monitorNotificationChannelIBMFunction(name string) string {
-	return fmt.Sprintf(`
-resource "sysdig_monitor_notification_channel_ibm_function" "nc_ibm_function" {
-	name = "%s"
-	ibm_function_type = "WEB_ACTION"
-	url = "https://eu-gb.functions.cloud.ibm.com/api/v1/web/namespaces/eeeeeeee-623b-4776-ba35-4065bcbfee7b/actions/hello-world/helloworld?param=true"
-	whisk_auth_token = "xxx"
-}
-
-data "sysdig_monitor_notification_channel_ibm_function" "nc_ibm_function" {
-	name = sysdig_monitor_notification_channel_ibm_function.nc_ibm_function.name
-}
-`, name)
-}
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_ibm_cloud_function_test.go b/sysdig/resource_sysdig_monitor_notification_channel_ibm_cloud_function_test.go
deleted file mode 100644
index ae416a5e..00000000
--- a/sysdig/resource_sysdig_monitor_notification_channel_ibm_cloud_function_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-//go:build tf_acc_sysdig_monitor || tf_acc_sysdig_common || tf_acc_ibm_monitor || tf_acc_ibm_common || tf_acc_onprem_monitor
-
-package sysdig_test
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-
-	"github.com/draios/terraform-provider-sysdig/sysdig"
-)
-
-func TestAccMonitorNotificationChannelIBMCloudFunction(t *testing.T) {
-	rText := func() string { return acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum) }
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck: sysdigOrIBMMonitorPreCheck(t),
-		ProviderFactories: map[string]func() (*schema.Provider, error){
-			"sysdig": func() (*schema.Provider, error) {
-				return sysdig.Provider(), nil
-			},
-		},
-		Steps: []resource.TestStep{
-			{
-				Config: monitorNotificationChannelIBMCloudFunctionWebAction(rText()),
-			},
-			{
-				ResourceName:      "sysdig_monitor_notification_channel_ibm_function.sample1",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-			{
-				Config: monitorNotificationChannelIBMCloudFunctionWebActionWithWishAuthToken(rText()),
-			},
-			{
-				ResourceName:      "sysdig_monitor_notification_channel_ibm_function.sample2",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-			{
-				Config: monitorNotificationChannelIBMCloudFunctionWebActionWithWishAuthTokenWithCurrentTeam(rText()),
-			},
-			{
-				ResourceName:      "sysdig_monitor_notification_channel_ibm_function.sample3",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-			{
-				Config: monitorNotificationChannelIBMCloudFunctionWebActionWithCustomData(rText()),
-			},
-			{
-				ResourceName:      "sysdig_monitor_notification_channel_ibm_function.sample4",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-			{
-				Config: monitorNotificationChannelIBMCloudFunctionCloudFunction(rText()),
-			},
-			{
-				ResourceName:      "sysdig_monitor_notification_channel_ibm_function.sample5",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
-func monitorNotificationChannelIBMCloudFunctionWebAction(name string) string {
-	return fmt.Sprintf(`
-resource "sysdig_monitor_notification_channel_ibm_function" "sample1" {
-	name = "Example Channel %s - IBM Function"
-	ibm_function_type = "WEB_ACTION"
-	url = "https://eu-gb.functions.cloud.ibm.com/api/v1/web/namespaces/eeeeeeee-623b-4776-ba35-4065bcbfee7b/actions/hello-world/helloworld?param=true"
-	whisk_auth_token = "xxx"
-}`, name)
-}
-
-func monitorNotificationChannelIBMCloudFunctionWebActionWithWishAuthToken(name string) string {
-	return fmt.Sprintf(`
-resource "sysdig_monitor_notification_channel_ibm_function" "sample2" {
-	name = "Example Channel %s - IBM Function"
-	ibm_function_type = "WEB_ACTION"
-	url = "https://eu-gb.functions.cloud.ibm.com/api/v1/web/namespaces/eeeeeeee-623b-4776-ba35-4065bcbfee7b/actions/hello-world/helloworld?param=true"
-	whisk_auth_token = "xxx"
-}`, name)
-}
-
-func monitorNotificationChannelIBMCloudFunctionWebActionWithWishAuthTokenWithCurrentTeam(name string) string {
-	return fmt.Sprintf(`
-resource "sysdig_monitor_notification_channel_ibm_function" "sample3" {
-	name = "Example Channel %s - IBM Function"
-	ibm_function_type = "WEB_ACTION"
-	url = "https://eu-gb.functions.cloud.ibm.com/api/v1/web/namespaces/eeeeeeee-623b-4776-ba35-4065bcbfee7b/actions/hello-world/helloworld?param=true"
-	share_with_current_team = true
-}`, name)
-}
-
-func monitorNotificationChannelIBMCloudFunctionWebActionWithCustomData(name string) string {
-	return fmt.Sprintf(`
-resource "sysdig_monitor_notification_channel_ibm_function" "sample4" {
-	name = "Example Channel %s - IBM Function"
-	ibm_function_type = "WEB_ACTION"
-	url = "https://eu-gb.functions.cloud.ibm.com/api/v1/web/namespaces/eeeeeeee-623b-4776-ba35-4065bcbfee7b/actions/hello-world/helloworld?param=true"
-	custom_data = {
-		"data1": "value1"
-		"data2": "value2"
-	}
-}`, name)
-}
-
-func monitorNotificationChannelIBMCloudFunctionCloudFunction(name string) string {
-	return fmt.Sprintf(`
-resource "sysdig_monitor_notification_channel_ibm_function" "sample5" {
-	name = "Example Channel %s - IBM Function"
-	ibm_function_type = "CLOUD_FUNCTION"
-	url = "https://eu-gb.functions.cloud.ibm.com/api/v1/namespaces/13eeeeee-623b-4776-ba35-4065bcbfee7b/actions/hello-world/myaction"
-	iam_api_key = "xxx"
-}`, name)
-}