diff --git a/controllerconfig/controllerconfig/scripts/controller_config b/controllerconfig/controllerconfig/scripts/controller_config
index c92d667d65..8fc5270e2f 100755
--- a/controllerconfig/controllerconfig/scripts/controller_config
+++ b/controllerconfig/controllerconfig/scripts/controller_config
@@ -479,13 +479,15 @@ start()
     fi
 
     # Copy over kube-apiserver encryption provider config, admission control config and
-    # extra files referenced in admission control config
+    # extra files referenced in admission control config.
+    # Encryption provider config is a symbolic link hence using -P option to avoid
+    # copying the source content
     if [ -e $CONFIG_DIR/kubernetes/ ]
     then
         FILES=`ls $CONFIG_DIR/kubernetes/*.yaml`
         for FILE in $FILES
         do
-            cp $FILE /etc/kubernetes/
+            cp -P $FILE /etc/kubernetes/
             if [ $? -ne 0 ]
             then
                 fatal_error "Unable to copy kube-apiserver config file: $FILE"
diff --git a/controllerconfig/controllerconfig/scripts/controllerconfig.service b/controllerconfig/controllerconfig/scripts/controllerconfig.service
index a6e42cc5f3..404180eab0 100644
--- a/controllerconfig/controllerconfig/scripts/controllerconfig.service
+++ b/controllerconfig/controllerconfig/scripts/controllerconfig.service
@@ -2,6 +2,7 @@
 Description=controllerconfig service
 After=syslog.target network.target remote-fs.target sw-patch.service sysinv-agent.service
 After=network-online.target
+After=luks-fs-mgr.service
 Before=config.service
 
 [Service]