diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg
index e692efd7..03538301 100644
--- a/kickstart/files/kickstart.cfg
+++ b/kickstart/files/kickstart.cfg
@@ -1983,20 +1983,13 @@ if [ "${controller}" = true -a ${OSTREE_REPO_FETCHED} -eq 0 ] ; then
         fi
         ostree --repo=${repo} pull ${pull_options} ${instbr}:${instbr}
 
-        # This is used by patching
-        # - change the sysroot remote from NOT_SET to the new feed location
-        if [ "${insturl}" = "file://NOT_SET" ] ; then
-            file_feed="file:///var/www/pages/feed/rel-${sw_release}/ostree_repo/"
-            feed_branch="starlingx"
-            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}
-        fi
-
-        # TODO: Figure out a way on the second run /sysroot/ostree/2
-        #       to avoid this error string
-        #
-        # error: Remote configuration for "starlingx" already exists: (in config)
+        # This is used by patching.
+        # Set ostree remote to the local install feed
+        file_feed="file:///var/www/pages/feed/rel-${sw_release}/ostree_repo/"
+        feed_branch="starlingx"
+        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}
 
         # Check for noverifyssl
         if grep -q noverifyssl /proc/cmdline; then