diff --git a/builder.sh b/builder.sh
index 0e79ba1..652d867 100755
--- a/builder.sh
+++ b/builder.sh
@@ -45,7 +45,7 @@ echo "Composing ${VERSION}.${buildid} ..."
 
 # repos import
 cp images/shared/*.repo "${IMAGE_DIR}"
-cp "${IMAGE_DIR}"/repos/*.repo "${IMAGE_DIR}"
+cp "${IMAGE_DIR}"/{$IMAGE}/repos/*.repo "${IMAGE_DIR}"
 
 # Ensure manifest has correct ref and releasever 
 sed -i '/^ref:/d' "$MANIFEST" 
@@ -54,7 +54,7 @@ sed -i "1i releasever: ${VERSION}" "$MANIFEST"
 sed -i "1i ref: ${REF}" "$MANIFEST"
 
 #Run a optional per image script to do image specific things
-POSTPROCESS="${IMAGE_DIR}/postprocess.sh"
+POSTPROCESS="${IMAGE_DIR}/${IMAGE}"/postprocess.sh"
 if [[ -x "${POSTPROCESS}" ]]; then
     echo "Running postprocess script: ${POSTPROCESS}"
     "${POSTPROCESS}"