diff --git a/manifests/type/airship-core/phases/executors.yaml b/manifests/type/airship-core/phases/executors.yaml
index 6a9f720e1..0a339ab4f 100644
--- a/manifests/type/airship-core/phases/executors.yaml
+++ b/manifests/type/airship-core/phases/executors.yaml
@@ -19,16 +19,14 @@ move-options: {}
 action: move
 ---
 apiVersion: airshipit.org/v1alpha1
-kind: ImageConfiguration
+kind: IsoConfiguration
 metadata:
   name: isogen
   labels:
     airshipit.org/deploy-k8s: "false"
 builder:
-  networkConfigFileName: network-config
-  outputMetadataFileName: output-metadata.yaml
-  userDataFileName: user-data
+  outputFileName: ephemeral.iso
 container:
   containerRuntime: docker
-  image: quay.io/airshipit/isogen:latest-ubuntu_focal
-  volume: /srv/iso:/config
+  image: quay.io/airshipit/image-builder:latest-ubuntu_focal
+  volume: /srv/images:/config
diff --git a/manifests/type/airship-core/phases/phases.yaml b/manifests/type/airship-core/phases/phases.yaml
index ab58eeeb3..00dadec72 100644
--- a/manifests/type/airship-core/phases/phases.yaml
+++ b/manifests/type/airship-core/phases/phases.yaml
@@ -2,11 +2,11 @@
 apiVersion: airshipit.org/v1alpha1
 kind: Phase
 metadata:
-  name: bootstrap
+  name: bootstrap-iso
 config:
   executorRef:
     apiVersion: airshipit.org/v1alpha1
-    kind: ImageConfiguration
+    kind: IsoConfiguration
     name: isogen
   documentEntryPoint: ephemeral/bootstrap
 ---
diff --git a/tools/deployment/24_build_ephemeral_iso.sh b/tools/deployment/24_build_images.sh
similarity index 93%
rename from tools/deployment/24_build_ephemeral_iso.sh
rename to tools/deployment/24_build_images.sh
index 8f3ecfb12..b9e0d694a 100755
--- a/tools/deployment/24_build_ephemeral_iso.sh
+++ b/tools/deployment/24_build_images.sh
@@ -17,5 +17,5 @@ set -xe
 : ${AIRSHIPCTL_PROJECT:="../airshipctl"}
 
 cd ${AIRSHIPCTL_PROJECT}
-./tools/deployment/24_build_ephemeral_iso.sh
+./tools/deployment/24_build_images.sh
 
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 3b30ec4d3..168a92c88 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -70,7 +70,7 @@
         - ./tools/deployment/01_install_kubectl.sh
         - ./tools/deployment/22_test_configs.sh
         - ./tools/deployment/23_pull_documents.sh
-        - ./tools/deployment/24_build_ephemeral_iso.sh
+        - ./tools/deployment/24_build_images.sh
         - ./tools/deployment/25_deploy_ephemeral_node.sh
         - ./tools/deployment/26_deploy_metal3_capi_ephemeral_node.sh
         - ./tools/deployment/30_deploy_controlplane.sh
@@ -81,7 +81,7 @@
         # functional.
         # - ./tools/deployment/34_deploy_worker_node.sh
         - ./tools/deployment/35_deploy_workload.sh
-      serve_dir: /srv/iso
+      serve_dir: /srv/images
       serve_port: 8099
     voting: false