diff --git a/infrastructure/configs/akri-devices.yaml b/apps/akri-demo.yaml
similarity index 70%
rename from infrastructure/configs/akri-devices.yaml
rename to apps/akri-demo.yaml
index 3e17889..41e6cc9 100644
--- a/infrastructure/configs/akri-devices.yaml
+++ b/apps/akri-demo.yaml
@@ -2,7 +2,7 @@ apiVersion: akri.sh/v0
 kind: Configuration
 metadata:
   name: pico-debugger
-  namespace: akri
+  namespace: default
 spec:
   capacity: 1
   discoveryHandler:
@@ -11,3 +11,8 @@ spec:
       udevRules:
       - ATTRS{idVendor}=="2e8a", ATTRS{idProduct}=="000c"
     name: udev
+  brokerSpec:
+    brokerPodSpec:
+      containers:
+        - name: akri-demo
+          image: traefik/whoami
diff --git a/apps/kustomization.yaml b/apps/kustomization.yaml
index feb9e20..c06dd53 100644
--- a/apps/kustomization.yaml
+++ b/apps/kustomization.yaml
@@ -4,6 +4,7 @@ resources:
   - ./lldap
   - ./authelia
   - ./whoami.yaml
+  - ./akri-demo.yaml
 
 components:
   - ./traefik-dashboard
diff --git a/infrastructure/configs/kustomization.yaml b/infrastructure/configs/kustomization.yaml
index 38bb2d9..8d83a39 100644
--- a/infrastructure/configs/kustomization.yaml
+++ b/infrastructure/configs/kustomization.yaml
@@ -6,5 +6,4 @@ resources:
   - ./certificates.yaml
   - ./middleware.yaml
 
-  - ./akri-devices.yaml
   - ./intel-devices