diff --git a/server/conf/cloudstack-limits.conf.in b/server/conf/cloudstack-limits.conf.in
index c28ad8c3c78..c97f0b5603a 100644
--- a/server/conf/cloudstack-limits.conf.in
+++ b/server/conf/cloudstack-limits.conf.in
@@ -17,5 +17,5 @@
 
 # Specific limits for the CloudStack management server which
 # runs under the user 'cloud' by default
-@MSUSER hard nofile 4096
-@MSUSER soft nofile 4096
+@MSUSER@ hard nofile 4096
+@MSUSER@ soft nofile 4096
diff --git a/server/conf/cloudstack-sudoers.in b/server/conf/cloudstack-sudoers.in
index c525d3cf44b..dcfb17b3ddf 100644
--- a/server/conf/cloudstack-sudoers.in
+++ b/server/conf/cloudstack-sudoers.in
@@ -18,5 +18,5 @@
 # The CloudStack management server needs sudo permissions
 # without a password.
 
-@MSUSER ALL =NOPASSWD : ALL
+@MSUSER@ ALL =NOPASSWD : ALL