diff --git a/kubernetes/kustomization.yaml b/kubernetes/kustomization.yaml
index abd5f37..bfd1ff9 100644
--- a/kubernetes/kustomization.yaml
+++ b/kubernetes/kustomization.yaml
@@ -1,22 +1,20 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-<<<<<<< HEAD
 namespace: jambonz
 
 resources:
 - namespace.yaml
 - db/db-create.yaml
-=======
-namespace: default # Replace by your namespace here
-
-resources:
 - namespace.yaml
->>>>>>> feat: Add K8S manifest to deploy Jambonz using Kustomize
 - mysql/mysql-service.yaml
 - mysql/mysql-statefulset.yaml
 - redis/redis-service.yaml
 - redis/redis-statefulset.yaml
+- sbc-sip/sbc-sip-configmap.yaml
+- sbc-sip/sbc-sip-daemonset.yaml
+- influxdb/influxdb-service.yaml
+- influxdb/influxdb-statefulset.yaml
 - rtpengine/rtpengine-service.yaml
 - rtpengine/rtpengine-deployment.yaml
 - webapp/webapp-deployment.yaml
@@ -25,18 +23,7 @@ resources:
 - api-server/api-server-deployment.yaml
 - api-server/api-server-service.yaml
 - api-server/api-server-ingress.yaml
-- drachtio-sbc/drachtio-sbc-deployment.yaml
-- drachtio-sbc/drachtio-sbc-service.yaml
-- drachtio-sbc/drachtio-sbc-configmap.yaml
-- call-router/call-router-deployment.yaml
-- call-router/call-router-service.yaml
-- sbc-inbound/sbc-inbound-deployment.yaml
-- sbc-outbound/sbc-outbound-deployment.yaml
-- registrar/registrar-deployment.yaml
-<<<<<<< HEAD
 secretGenerator:
   - envs:
       - jambonz.env
-    name: jambonz
-=======
->>>>>>> feat: Add K8S manifest to deploy Jambonz using Kustomize
+    name: jambonz
\ No newline at end of file
diff --git a/kubernetes/sbc-rtp/sbc-rtp-configmap.yaml b/kubernetes/sbc-rtp/sbc-rtp-configmap.yaml
new file mode 100644
index 0000000..917fddb
--- /dev/null
+++ b/kubernetes/sbc-rtp/sbc-rtp-configmap.yaml
@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: drachtio-sbc-sip-conf
+data:
+  drachtio.conf.xml: |
+    <drachtio>
+
+        <!-- udp port to listen on for client connections and shared secret used to authenticate clients -->
+        <admin port="9023" secret="cymru">0.0.0.0</admin>
+        <sip>
+          <contact>sip:*:5064;transport=udp</contact>
+          <udp-mtu>4096</udp-mtu>
+        </sip>
+        <cdrs>false</cdrs>
+
+        <logging>
+            <sofia-loglevel>3</sofia-loglevel>
+            <loglevel>info</loglevel>
+        </logging>
+
+    </drachtio>
\ No newline at end of file
diff --git a/kubernetes/sbc-rtp/sbc-rtp-daemonset.yaml b/kubernetes/sbc-rtp/sbc-rtp-daemonset.yaml
new file mode 100644
index 0000000..44906d4
--- /dev/null
+++ b/kubernetes/sbc-rtp/sbc-rtp-daemonset.yaml
@@ -0,0 +1,54 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: drachtio-sbc-rtp
+  labels:
+    app: drachtio-sbc-rtp
+spec:
+  selector:
+    matchLabels:
+      app: drachtio-sbc-rtp
+  template:
+    metadata:
+      labels:
+        app: drachtio-sbc-rtp
+    spec:
+      nodeSelector:
+        eks.amazonaws.com/nodegroup: sbc-node-group
+      hostNetwork: true
+      containers:
+        - name: drachtio
+          image: drachtio/drachtio-server:0.8.12
+          ports:
+            - containerPort: 9023
+              protocol: TCP
+            - containerPort: 5064
+              protocol: UDP
+          resources: {}
+          volumeMounts:
+            - mountPath: /etc/drachtio.conf.xml
+              name: drachtio-sbc-rtp-conf
+              subPath: drachtio.conf.xml
+        - name: sbc-rtpengine-sidecar
+          image: jambonz/sbc-rtpengine-sidecar:latest
+          env:
+            - name: NODE_ENV
+              value: production
+            - name: RTPENGINE_DTMF_LOG_PORT
+              value: 22223
+            - name: JAMBONES_CLUSTER_ID
+              value: jb
+            - name: JAMBONES_REDIS_HOST
+              value: redis
+            - name: JAMBONES_REDIS_PORT
+              value: "6379"
+            - name: ENABLE_METRICS
+              value: "0"
+      restartPolicy: Always
+      volumes:
+      - name: drachtio-sbc-rtp-conf
+        configMap:
+          name: drachtio-sbc-rtp-conf
+          items:
+          - key: drachtio.conf.xml
+            path: drachtio.conf.xml
\ No newline at end of file
diff --git a/kubernetes/sbc-sip/sbc-sip-daemonset.yaml b/kubernetes/sbc-sip/sbc-sip-daemonset.yaml
index 60fc389..30bb024 100644
--- a/kubernetes/sbc-sip/sbc-sip-daemonset.yaml
+++ b/kubernetes/sbc-sip/sbc-sip-daemonset.yaml
@@ -14,8 +14,12 @@ spec:
         app: drachtio-sbc-sip
     spec:
       nodeSelector:
-        eks.amazonaws.com/nodegroup: sbc-node-group
+        voip-environment: edge
       hostNetwork: true
+      tolerations:
+        - key: "voip-edge"
+          operator: "Exists"
+          effect: "NoSchedule"
       containers:
         - name: drachtio
           image: drachtio/drachtio-server:0.8.12