diff --git a/solaris/solaris11/generate_wazuh_packages.sh b/solaris/solaris11/generate_wazuh_packages.sh
index a88d5057e0..e804444f89 100755
--- a/solaris/solaris11/generate_wazuh_packages.sh
+++ b/solaris/solaris11/generate_wazuh_packages.sh
@@ -180,6 +180,8 @@ create_package() {
 
 
     # Package generation process
+    # Added creation of wazuh-agent.xml service manifest file
+    svcbundle -o wazuh-agent.xml -s service-name=application/wazuh-agent -s start-method="${install_path}/bin/${control_binary} start" -s stop-method="${install_path}/bin/${control_binary} stop" -s refresh-method="${install_path}/bin/${control_binary} restart"
     pkgsend generate ${install_path} | pkgfmt > wazuh-agent.p5m.1
     sed "s|<INSTALL_PATH>|${install_path}|" ${current_path}/postinstall.sh > ${current_path}/postinstall.sh.new
     mv ${current_path}/postinstall.sh.new ${current_path}/postinstall.sh
@@ -192,12 +194,10 @@ create_package() {
         mv wazuh-agent.p5m.1.aux_sed wazuh-agent.p5m.1
     done
     # Add service files
-    echo "file smf_manifest.xml path=lib/svc/manifest/site/post-install.xml owner=root group=sys mode=0744 restart_fmri=svc:/system/manifest-import:default" >> wazuh-agent.p5m.1
+    echo "file smf_manifest.xml path=lib/svc/manifest/site/wazuh-postinstall.xml owner=root group=sys mode=0744 restart_fmri=svc:/system/manifest-import:default" >> wazuh-agent.p5m.1
     echo "dir  path=var/ossec/installation_scripts owner=root group=bin mode=0755" >> wazuh-agent.p5m.1
     echo "file postinstall.sh path=var/ossec/installation_scripts/postinstall.sh owner=root group=bin mode=0744" >> wazuh-agent.p5m.1
-    echo "file wazuh-agent path=etc/init.d/wazuh-agent owner=root group=sys mode=0744" >> wazuh-agent.p5m.1
-    echo "file S97wazuh-agent path=etc/rc2.d/S97wazuh-agent owner=root group=sys mode=0744" >> wazuh-agent.p5m.1
-    echo "file S97wazuh-agent path=etc/rc3.d/S97wazuh-agent owner=root group=sys mode=0744" >> wazuh-agent.p5m.1
+    echo "file wazuh-agent.xml path=lib/svc/manifest/application/wazuh-agent.xml owner=root group=sys mode=0744 restart_fmri=svc:/system/manifest-import:default" >> wazuh-agent.p5m.1
 
     # Add user and group wazuh
     echo "group groupname=wazuh" >> wazuh-agent.p5m.1
diff --git a/solaris/solaris11/postinstall.sh b/solaris/solaris11/postinstall.sh
index fe7fb2a8f7..772571fa3b 100644
--- a/solaris/solaris11/postinstall.sh
+++ b/solaris/solaris11/postinstall.sh
@@ -60,4 +60,9 @@ rm -rf ${SCA_TMP_DIR}
 
 # Remove upgrade files after install/upgrade
 rm -rf ${install_path}/installation_scripts/
-rm -rf /lib/svc/manifest/site/post-install.xml
\ No newline at end of file
+
+# Disable the wazuh-postinstall service
+svcadm disable site/wazuh-postinstall
+
+# Remove the wazuh-postinstall service manifest
+rm -rf /lib/svc/manifest/site/wazuh-postinstall.xml
\ No newline at end of file
diff --git a/solaris/solaris11/smf_manifest.xml b/solaris/solaris11/smf_manifest.xml
index 8b49a19a56..5730517e8e 100644
--- a/solaris/solaris11/smf_manifest.xml
+++ b/solaris/solaris11/smf_manifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 <!DOCTYPE service_bundle
   SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
-<service_bundle type="manifest" name="site/wazuh-install">
-    <service version="1" type="service" name="site/wazuh-install">
+<service_bundle type="manifest" name="site/wazuh-postinstall">
+    <service version="1" type="service" name="site/wazuh-postinstall">
         <dependency restart_on="none" type="service"
             name="multi_user_dependency" grouping="require_all">
             <service_fmri value="svc:/milestone/multi-user"/>
@@ -20,4 +20,4 @@
         </property_group>
         <instance enabled="true" name="default"> </instance>
     </service>
-</service_bundle>
\ No newline at end of file
+</service_bundle>