diff --git a/devfile.yaml b/devfile.yaml
index 9e5d4b3..5cba7c8 100644
--- a/devfile.yaml
+++ b/devfile.yaml
@@ -26,8 +26,12 @@ components:
 
   # Receiver service
   - name: receiver
+    image:
+      imageName: receiver:latest
+      dockerfile:
+        uri: whisper-distributed/receiver/Dockerfile
+        buildContext: whisper-distributed/receiver
     container:
-      image: receiver:latest
       endpoints:
         - name: http
           targetPort: 8000
@@ -40,8 +44,12 @@ components:
 
   # Splitter service  
   - name: splitter
+    image:
+      imageName: splitter:latest
+      dockerfile:
+        uri: whisper-distributed/splitter/Dockerfile
+        buildContext: whisper-distributed/splitter
     container:
-      image: splitter:latest
       endpoints:
         - name: http
           targetPort: 8000
@@ -52,8 +60,12 @@ components:
 
   # Processor1 service
   - name: processor1
+    image:
+      imageName: processor:latest
+      dockerfile:
+        uri: whisper-distributed/processor/Dockerfile
+        buildContext: whisper-distributed/processor
     container:
-      image: processor:latest
       env:
         - name: PROCESSOR_ID
           value: "1"
@@ -67,8 +79,12 @@ components:
 
   # Processor2 service
   - name: processor2
+    image:
+      imageName: processor2:latest
+      dockerfile:
+        uri: whisper-distributed/processor/Dockerfile
+        buildContext: whisper-distributed/processor
     container:
-      image: processor:latest
       env:
         - name: PROCESSOR_ID
           value: "2"
@@ -82,8 +98,12 @@ components:
 
   # Unifier service
   - name: unifier
+    image:
+      imageName: unifier:latest
+      dockerfile:
+        uri: whisper-distributed/unifier/Dockerfile
+        buildContext: whisper-distributed/unifier
     container:
-      image: unifier:latest
       endpoints:
         - name: http
           targetPort: 8000
@@ -111,43 +131,4 @@ components:
     volume:
       size: 2Gi
 
-# Build commands for each service
-commands:
-  # Build commands
-  - id: build-receiver
-    exec:
-      component: receiver
-      workingDir: /projects/receiver
-      commandLine: docker build -t receiver:latest .
-
-  - id: build-splitter
-    exec:
-      component: splitter
-      workingDir: /projects/splitter
-      commandLine: docker build -t splitter:latest .
-
-  - id: build-processor
-    exec:
-      component: processor1
-      workingDir: /projects/processor
-      commandLine: docker build -t processor:latest .
-
-  - id: build-unifier
-    exec:
-      component: unifier
-      workingDir: /projects/unifier
-      commandLine: docker build -t unifier:latest .
-
-  # Composite build command
-  - id: build-all
-    composite:
-      commands:
-        - build-receiver
-        - build-splitter
-        - build-processor
-        - build-unifier
-
-# Events
-events:
-  preStart:
-    - build-all
\ No newline at end of file
+# Events - removed preStart build commands since images build automatically
\ No newline at end of file