diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg
index d441e8df..77af8759 100644
--- a/kickstart/files/kickstart.cfg
+++ b/kickstart/files/kickstart.cfg
@@ -45,6 +45,7 @@
 #   Post Nochroot - Save Install scripts and Logs
 #   Post Nochroot - Workarounds for enabling integration
 #   Post Nochroot - Set up /etc/fstab
+#   Post Nochroot - Set up package file links per node type
 #
 ############################################################################
 #
@@ -2339,3 +2340,31 @@ touch ${IMAGE_ROOTFS}/etc/platform/.first_boot
 
 true
 %end
+
+##########################################################################
+
+%post --interpreter=/bin/bash --nochroot
+HOOK_LABEL="post_nochroot"
+. /tmp/lat/ks_functions.sh
+
+# This needs to update all available ostree based rootfs
+
+ilog "****************************************************************"
+ilog "***    Post Nochroot - Set up package links per node type    ***"
+ilog "****************************************************************"
+ilog "IMAGE_ROOTFS=${IMAGE_ROOTFS}"
+
+if [ ! "${controller}" = true -a "${worker}" = true ] ; then
+    ilog "Setting up ${TRAIT__WORKER} package file links"
+    ln -s /etc/goenabled.d/config_goenabled_check.sh.worker ${IMAGE_ROOTFS}/etc/goenabled.d/config_goenabled_check.sh
+    ln -s /dev/null ${IMAGE_ROOTFS}/etc/systemd/system/controllerconfig.service
+elif [ "${controller}" = true ] ; then
+    ilog "Setting up ${TRAIT__CONTROLLER} package file links"
+    ln -s /etc/goenabled.d/config_goenabled_check.sh.controller ${IMAGE_ROOTFS}/etc/goenabled.d/config_goenabled_check.sh
+    ln -s /dev/null ${IMAGE_ROOTFS}/etc/systemd/system/workerconfig.service
+fi
+
+chmod 700 ${IMAGE_ROOTFS}/etc/goenabled.d/config_goenabled_check.sh
+
+true
+%end