diff --git a/samples/industrial-data-simulator/configs/simple/config.yml b/samples/industrial-data-simulator/configs/simple/config.yml
deleted file mode 100644
index 21b8b81..0000000
--- a/samples/industrial-data-simulator/configs/simple/config.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-metrics:
-  type: prometheus
-  port: 2114
-logLevel: 0
-simulation:
-  target:
-    host: aio-mq-dmqtt-frontend
-    port: 1883
-  sites:
-    - name: site0
-      mqttVersion: v5
-      assetCount: 1
-      tags:
-        - id: float_1
-          configuration: x
-          count: 1
-      rate:
-        messagesPerPeriod: 1
-        periodSeconds: 1
-        tagsPerMessage: 2
-      payloadFormat: OPCUA
-      topicFormat: /{{.SiteName}}/{{.AssetName}}
diff --git a/samples/industrial-data-simulator/manifest.yml b/samples/industrial-data-simulator/manifest.yml
index 1874370..dfceb20 100644
--- a/samples/industrial-data-simulator/manifest.yml
+++ b/samples/industrial-data-simulator/manifest.yml
@@ -88,3 +88,16 @@ spec:
   type: ClusterIP
   selector:
     app: data-simulator
+---
+apiVersion: mq.iotoperations.azure.com/v1beta1
+kind: BrokerListener
+metadata:
+  name: industrial-data-simulator-listener
+  namespace: azure-iot-operations
+spec:
+  authenticationEnabled: false
+  authorizationEnabled: false
+  brokerRef: broker
+  port: 1883
+  serviceName: aio-mq-dmqtt-frontend
+  serviceType: clusterIp
\ No newline at end of file
diff --git a/samples/industrial-data-simulator/manifests/anomaly-detection/manifest.yml b/samples/industrial-data-simulator/manifests/anomaly-detection/manifest.yml
index 7b757f5..56180bc 100644
--- a/samples/industrial-data-simulator/manifests/anomaly-detection/manifest.yml
+++ b/samples/industrial-data-simulator/manifests/anomaly-detection/manifest.yml
@@ -342,4 +342,17 @@ spec:
     name: prometheus
   type: ClusterIP
   selector:
-    app: data-simulator
\ No newline at end of file
+    app: data-simulator
+---
+apiVersion: mq.iotoperations.azure.com/v1beta1
+kind: BrokerListener
+metadata:
+  name: industrial-data-simulator-listener
+  namespace: azure-iot-operations
+spec:
+  authenticationEnabled: false
+  authorizationEnabled: false
+  brokerRef: broker
+  port: 1883
+  serviceName: aio-mq-dmqtt-frontend
+  serviceType: clusterIp
\ No newline at end of file
diff --git a/samples/industrial-data-simulator/manifests/oee/manifest.yml b/samples/industrial-data-simulator/manifests/oee/manifest.yml
index 825cba0..82aefcc 100644
--- a/samples/industrial-data-simulator/manifests/oee/manifest.yml
+++ b/samples/industrial-data-simulator/manifests/oee/manifest.yml
@@ -12,7 +12,7 @@ data:
     logLevel: 1
     simulation:
       target:
-        host: localhost
+        host: aio-mq-dmqtt-frontend
         port: 1883
       sites:
         - name: RLine1_1
@@ -577,4 +577,17 @@ spec:
     name: prometheus
   type: ClusterIP
   selector:
-    app: data-simulator
\ No newline at end of file
+    app: data-simulator
+---
+apiVersion: mq.iotoperations.azure.com/v1beta1
+kind: BrokerListener
+metadata:
+  name: industrial-data-simulator-listener
+  namespace: azure-iot-operations
+spec:
+  authenticationEnabled: false
+  authorizationEnabled: false
+  brokerRef: broker
+  port: 1883
+  serviceName: aio-mq-dmqtt-frontend
+  serviceType: clusterIp
\ No newline at end of file
diff --git a/samples/industrial-data-simulator/manifests/simple/manifest.yml b/samples/industrial-data-simulator/manifests/simple/manifest.yml
index 1874370..5c80fc6 100644
--- a/samples/industrial-data-simulator/manifests/simple/manifest.yml
+++ b/samples/industrial-data-simulator/manifests/simple/manifest.yml
@@ -88,3 +88,29 @@ spec:
   type: ClusterIP
   selector:
     app: data-simulator
+---
+apiVersion: mq.iotoperations.azure.com/v1beta1
+kind: BrokerListener
+metadata:
+  name: industrial-data-simulator-listener
+  namespace: azure-iot-operations
+spec:
+  authenticationEnabled: false
+  authorizationEnabled: false
+  brokerRef: broker
+  port: 1883
+  serviceName: aio-mq-dmqtt-frontend
+  serviceType: clusterIp
+---
+apiVersion: mq.iotoperations.azure.com/v1beta1
+kind: BrokerListener
+metadata:
+  name: industrial-data-simulator-listener
+  namespace: azure-iot-operations
+spec:
+  authenticationEnabled: false
+  authorizationEnabled: false
+  brokerRef: broker
+  port: 1883
+  serviceName: aio-mq-dmqtt-frontend
+  serviceType: clusterIp
\ No newline at end of file