diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg
index a75b6c42..a1afe51e 100644
--- a/kickstart/files/kickstart.cfg
+++ b/kickstart/files/kickstart.cfg
@@ -2638,6 +2638,12 @@ if [ "${controller}" = true ] ; then
         ilog "Replacing ostree sysroot remote with: ${file_feed} ${feed_branch}"
         ostree --repo=/sysroot/ostree/repo remote delete ${instname}
         ostree --repo=/sysroot/ostree/repo remote add ${instname} ${file_feed} ${feed_branch}
+        # Set feed ostree remote "starlingx" to point to active controller's feed ostree repo
+        feed_remote_name="starlingx"
+        feed_remote_url="http://controller:8080/feed/rel-${sw_release}/ostree_repo/"
+        ilog "Replacing ostree feed remote with: ${feed_remote_url} ${feed_remote_name}"
+        ostree --repo=${repo} remote delete ${feed_remote_name}
+        ostree --repo=${repo} remote add ${feed_remote_name} ${feed_remote_url} ${feed_branch}
 
         # This fetch is only needed once because the repo is stored in /var
         set_variable "ostree_repo_fetched"
diff --git a/kickstart/files/miniboot.cfg b/kickstart/files/miniboot.cfg
index 98952405..44617882 100644
--- a/kickstart/files/miniboot.cfg
+++ b/kickstart/files/miniboot.cfg
@@ -2197,6 +2197,12 @@ if [ "${controller}" = true ] ; then
     ilog "Replacing ostree sysroot remote ${instname} with: ${file_feed} ${feed_branch}"
     ostree --repo=/sysroot/ostree/repo remote delete ${instname}
     ostree --repo=/sysroot/ostree/repo remote add ${instname} ${file_feed} ${feed_branch}
+    # Set feed ostree remote "starlingx" to point to active controller's feed ostree repo
+    feed_remote_name="starlingx"
+    feed_remote_url="http://controller:8080/feed/rel-${sw_release}/ostree_repo/"
+    ilog "Replacing ostree feed remote with: ${feed_remote_url} ${feed_remote_name}"
+    ostree --repo=${repo} remote delete ${feed_remote_name}
+    ostree --repo=${repo} remote add ${feed_remote_name} ${feed_remote_url} ${feed_branch}
 
     # This fetch is only needed once because the repo is stored in /var
     set_variable "ostree_repo_fetched"