diff --git a/components/schemas/images/Image.yml b/components/schemas/images/Image.yml
index bb859ae7..883db54b 100644
--- a/components/schemas/images/Image.yml
+++ b/components/schemas/images/Image.yml
@@ -8,8 +8,6 @@ required:
   - size
   - backend
   - requires
-  - build
-  - factory
   - config
   - state
   - events
@@ -68,9 +66,19 @@ properties:
     properties:
       args:
         type: object
-        description: Arguments to pass to the factory during a build of this image.
+        description: Arguments to pass to the builder during a build of this image.
         additionalProperties:
           type: string
+  builder:
+    type: object
+    nullable: true
+    description: Configuration options regarding the builder used to create/import this Image.
+    required:
+      - integration_id
+    properties: 
+      integration_id: 
+        description: The ID of the Integration used to do the build.
+        $ref: ../ID.yml
   config:
     type: object
     description: Configuration settings for the image.
@@ -164,7 +172,7 @@ properties:
   factory:
     type: object
     nullable: true
-    description: Identifies which factory the image was built on and when.
+    description: Information about the Factory service that built/imported the Image into Cycle.
     required:
       - node_id
       - cached
diff --git a/components/schemas/images/sources/ImageSource.yml b/components/schemas/images/sources/ImageSource.yml
index 5b536486..37ee8925 100644
--- a/components/schemas/images/sources/ImageSource.yml
+++ b/components/schemas/images/sources/ImageSource.yml
@@ -28,6 +28,16 @@ properties:
     $ref: "./ImageSourceAbout.yml"
   origin:
     $ref: "../origins/ImageOrigin.yml"
+  builder:
+    type: object
+    nullable: true
+    description: Configuration options regarding the builder used to create/import Images using this Image Source.
+    required:
+      - integration_id
+    properties:
+      integration_id:
+        description: The ID of the Integration used to do the build.
+        $ref: ../../ID.yml
   creator:
     "$ref": "../../creators/CreatorScope.yml"
   state: