diff --git a/README.md b/README.md
index 45f50fbd..b5ac3789 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ $ npm install -g @salesforce/cli
 $ sf COMMAND
 running command...
 $ sf (--version|-v)
-@salesforce/cli/2.123.0 linux-x64 node-v22.22.0
+@salesforce/cli/2.123.1 linux-x64 node-v22.22.0
 $ sf --help [COMMAND]
 USAGE
   $ sf COMMAND
@@ -61,8 +61,6 @@ See [architecture page](ARCHITECTURE.md) for diagrams of the Salesforce CLI.
 - [`sf alias set`](#sf-alias-set)
 - [`sf alias unset`](#sf-alias-unset)
 - [`sf analytics generate template`](#sf-analytics-generate-template)
-- [`sf apex generate class`](#sf-apex-generate-class)
-- [`sf apex generate trigger`](#sf-apex-generate-trigger)
 - [`sf apex get log`](#sf-apex-get-log)
 - [`sf apex get test`](#sf-apex-get-test)
 - [`sf apex list log`](#sf-apex-list-log)
@@ -205,6 +203,8 @@ See [architecture page](ARCHITECTURE.md) for diagrams of the Salesforce CLI.
 - [`sf sobject describe`](#sf-sobject-describe)
 - [`sf sobject list`](#sf-sobject-list)
 - [`sf static-resource generate`](#sf-static-resource-generate)
+- [`sf template generate apex class`](#sf-template-generate-apex-class)
+- [`sf template generate apex trigger`](#sf-template-generate-apex-trigger)
 - [`sf update [CHANNEL]`](#sf-update-channel)
 - [`sf version`](#sf-version)
 - [`sf visualforce generate component`](#sf-visualforce-generate-component)
@@ -1277,135 +1277,7 @@ FLAG DESCRIPTIONS
     directory.
 ```
 
-_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.4.7/src/commands/analytics/generate/template.ts)_
-
-## `sf apex generate class`
-
-Generate an Apex class.
-
-```
-USAGE
-  $ sf apex generate class -n <value> [--json] [--flags-dir <value>] [-t
-    ApexException|ApexUnitTest|BasicUnitTest|DefaultApexClass|InboundEmailService] [-d <value>] [--api-version <value>]
-
-FLAGS
-  -d, --output-dir=<value>   [default: .] Directory for saving the created files.
-  -n, --name=<value>         (required) Name of the generated Apex class.
-  -t, --template=<option>    [default: DefaultApexClass] Template to use for file creation.
-                             <options: ApexException|ApexUnitTest|BasicUnitTest|DefaultApexClass|InboundEmailService>
-      --api-version=<value>  Override the api version used for api requests made by this command
-
-GLOBAL FLAGS
-  --flags-dir=<value>  Import flag values from a directory.
-  --json               Format output as json.
-
-DESCRIPTION
-  Generate an Apex class.
-
-  Generates the Apex *.cls file and associated metadata file. These files must be contained in a parent directory called
-  "classes" in your package directory. Either run this command from an existing directory of this name, or use the
-  --output-dir flag to generate one or point to an existing one.
-
-ALIASES
-  $ sf force apex class create
-
-EXAMPLES
-  Generate two metadata files associated with the MyClass Apex class (MyClass.cls and MyClass.cls-meta.xml) in the
-  current directory:
-
-    $ sf apex generate class --name MyClass
-
-  Similar to previous example, but generates the files in the "force-app/main/default/classes" directory:
-
-    $ sf apex generate class --name MyClass --output-dir force-app/main/default/classes
-
-FLAG DESCRIPTIONS
-  -d, --output-dir=<value>  Directory for saving the created files.
-
-    The location can be an absolute path or relative to the current working directory. The default is the current
-    directory.
-
-  -n, --name=<value>  Name of the generated Apex class.
-
-    The name can be up to 40 characters and must start with a letter.
-
-  -t, --template=ApexException|ApexUnitTest|BasicUnitTest|DefaultApexClass|InboundEmailService
-
-    Template to use for file creation.
-
-    Supplied parameter values or default values are filled into a copy of the template.
-```
-
-_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.4.7/src/commands/apex/generate/class.ts)_
-
-## `sf apex generate trigger`
-
-Generate an Apex trigger.
-
-```
-USAGE
-  $ sf apex generate trigger -n <value> [--json] [--flags-dir <value>] [-t ApexTrigger] [-d <value>] [--api-version
-    <value>] [-s <value>] [-e before insert|before update|before delete|after insert|after update|after delete|after
-    undelete...]
-
-FLAGS
-  -d, --output-dir=<value>   [default: .] Directory for saving the created files.
-  -e, --event=<option>...    [default: before insert] Events that fire the trigger.
-                             <options: before insert|before update|before delete|after insert|after update|after
-                             delete|after undelete>
-  -n, --name=<value>         (required) Name of the generated Apex trigger
-  -s, --sobject=<value>      [default: SOBJECT] Salesforce object to generate a trigger on.
-  -t, --template=<option>    [default: ApexTrigger] Template to use for file creation.
-                             <options: ApexTrigger>
-      --api-version=<value>  Override the api version used for api requests made by this command
-
-GLOBAL FLAGS
-  --flags-dir=<value>  Import flag values from a directory.
-  --json               Format output as json.
-
-DESCRIPTION
-  Generate an Apex trigger.
-
-  Generates the Apex trigger *.trigger file and associated metadata file. These files must be contained in a parent
-  directory called "triggers" in your package directory. Either run this command from an existing directory of this
-  name, or use the --output-dir flag to generate one or point to an existing one.
-
-  If you don't specify the --sobject flag, the .trigger file contains the generic placeholder SOBJECT; replace it with
-  the Salesforce object you want to generate a trigger for. If you don't specify --event, "before insert" is used.
-
-ALIASES
-  $ sf force apex trigger create
-
-EXAMPLES
-  Generate two files associated with the MyTrigger Apex trigger (MyTrigger.trigger and MyTrigger.trigger-meta.xml) in
-  the current directory:
-
-    $ sf apex generate trigger --name MyTrigger
-
-  Similar to the previous example, but generate the files in the "force-app/main/default/triggers" directory:
-
-    $ sf apex generate trigger --name MyTrigger --output-dir force-app/main/default/triggers
-
-  Generate files for a trigger that fires on the Account object before and after an insert:
-
-    $ sf apex generate trigger --name MyTrigger --sobject Account --event "before insert,after insert"
-
-FLAG DESCRIPTIONS
-  -d, --output-dir=<value>  Directory for saving the created files.
-
-    The location can be an absolute path or relative to the current working directory. The default is the current
-    directory.
-
-  -n, --name=<value>  Name of the generated Apex trigger
-
-    The name can be up to 40 characters and must start with a letter.
-
-  -t, --template=ApexTrigger  Template to use for file creation.
-
-    Supplied parameter values or default values are filled into a copy of the template.
-```
-
-_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.4.7/src/commands/apex/generate/trigger.ts)_
+_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.5.1/src/commands/analytics/generate/template.ts)_
 
 ## `sf apex get log`
 
@@ -3615,7 +3487,7 @@ FLAG DESCRIPTIONS
     Supplied parameter values or default values are filled into a copy of the template.
 ```
 
-_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.4.7/src/commands/lightning/generate/app.ts)_
+_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.5.1/src/commands/lightning/generate/app.ts)_
 
 ## `sf lightning generate component`
 
@@ -3684,7 +3556,7 @@ FLAG DESCRIPTIONS
     Supplied parameter values or default values are filled into a copy of the template.
 ```
 
-_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.4.7/src/commands/lightning/generate/component.ts)_
+_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.5.1/src/commands/lightning/generate/component.ts)_
 
 ## `sf lightning generate event`
 
@@ -3739,7 +3611,7 @@ FLAG DESCRIPTIONS
     Supplied parameter values or default values are filled into a copy of the template.
 ```
 
-_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.4.7/src/commands/lightning/generate/event.ts)_
+_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.5.1/src/commands/lightning/generate/event.ts)_
 
 ## `sf lightning generate interface`
 
@@ -3794,7 +3666,7 @@ FLAG DESCRIPTIONS
     Supplied parameter values or default values are filled into a copy of the template.
 ```
 
-_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.4.7/src/commands/lightning/generate/interface.ts)_
+_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.5.1/src/commands/lightning/generate/interface.ts)_
 
 ## `sf lightning generate test`
 
@@ -3849,7 +3721,7 @@ FLAG DESCRIPTIONS
     Supplied parameter values or default values are filled into a copy of the template.
 ```
 
-_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.4.7/src/commands/lightning/generate/test.ts)_
+_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.5.1/src/commands/lightning/generate/test.ts)_
 
 ## `sf logic get test`
 
@@ -6050,7 +5922,7 @@ FLAG DESCRIPTIONS
     --installation-key-bypass flag is required.
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/convert.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/convert.ts)_
 
 ## `sf package create`
 
@@ -6129,7 +6001,7 @@ FLAG DESCRIPTIONS
     Org-Dependent Unlocked Packages" in the Salesforce DX Developer Guide.
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/create.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/create.ts)_
 
 ## `sf package delete`
 
@@ -6171,7 +6043,7 @@ EXAMPLES
     $ sf package delete --package 0Ho... --target-dev-hub devhub@example.com
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/delete.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/delete.ts)_
 
 ## `sf package install`
 
@@ -6270,7 +6142,7 @@ FLAG DESCRIPTIONS
     - Delete: Delete removed components, except for custom objects and custom fields, that don't have dependencies.
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/install.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/install.ts)_
 
 ## `sf package install report`
 
@@ -6303,7 +6175,7 @@ EXAMPLES
     $ sf package install report --request-id 0Hf... --target-org me@example.com
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/install/report.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/install/report.ts)_
 
 ## `sf package installed list`
 
@@ -6335,7 +6207,7 @@ EXAMPLES
     $ sf package installed list --target-org me@example.com
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/installed/list.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/installed/list.ts)_
 
 ## `sf package list`
 
@@ -6373,7 +6245,7 @@ EXAMPLES
     $ sf package list --target-dev-hub devhub@example.com --verbose
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/list.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/list.ts)_
 
 ## `sf package push-upgrade abort`
 
@@ -6412,7 +6284,7 @@ EXAMPLES
     $ sf package push-upgrade abort --push-request-id 0DV... --target-dev-hub devhub@example.com
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/push-upgrade/abort.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/push-upgrade/abort.ts)_
 
 ## `sf package push-upgrade list`
 
@@ -6471,7 +6343,7 @@ EXAMPLES
     $ sf package push-upgrade list --package 033xyz –-status Failed
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/push-upgrade/list.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/push-upgrade/list.ts)_
 
 ## `sf package push-upgrade report`
 
@@ -6513,7 +6385,7 @@ EXAMPLES
     $ sf package push-upgrade report --push-request-id 0DV... --target-dev-hub devhub@example.com
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/push-upgrade/report.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/push-upgrade/report.ts)_
 
 ## `sf package push-upgrade schedule`
 
@@ -6600,7 +6472,7 @@ FLAG DESCRIPTIONS
     Overrides the value of the target-dev-hub configuration variable, if set.
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/push-upgrade/schedule.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/push-upgrade/schedule.ts)_
 
 ## `sf package uninstall`
 
@@ -6648,7 +6520,7 @@ EXAMPLES
     $ sf package uninstall --package "Undesirable Package Alias"
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/uninstall.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/uninstall.ts)_
 
 ## `sf package uninstall report`
 
@@ -6681,7 +6553,7 @@ EXAMPLES
     $ sf package uninstall report --request-id 06y... --target-org me@example.com
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/uninstall/report.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/uninstall/report.ts)_
 
 ## `sf package update`
 
@@ -6749,7 +6621,7 @@ FLAG DESCRIPTIONS
     the Installed Packages page. Only released package versions can be set as the recommended version.
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/update.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/update.ts)_
 
 ## `sf package version create`
 
@@ -6759,9 +6631,9 @@ Create a package version in the Dev Hub org.
 USAGE
   $ sf package version create -v <value> [--json] [--flags-dir <value>] [--api-version <value>] [-b <value>] [-c |
     --skip-validation] [-f <value>] [-k <value>] [-x] [-p <value>] [-d <value>] [--post-install-script <value>]
-    [--post-install-url <value>] [--releasenotes-url <value>] [--skip-ancestor-check] [--async-validation | ] [-t
-    <value>] [--uninstall-script <value>] [-e <value>] [-a <value>] [-n <value>] [-w <value>] [--language <value>]
-    [--verbose]
+    [--post-install-url <value>] [--releasenotes-url <value>] [--skip-ancestor-check] [--async-validation | ]
+    [--generate-pkg-zip] [-t <value>] [--uninstall-script <value>] [-e <value>] [-a <value>] [-n <value>] [-w <value>]
+    [--language <value>] [--verbose]
 
 FLAGS
   -a, --version-name=<value>         Name of the package version to be created; overrides the sfdx-project.json value.
@@ -6788,12 +6660,14 @@ FLAGS
                                      --installation-key-bypass is required)
       --api-version=<value>          Override the api version used for api requests made by this command
       --async-validation             Return a new package version before completing package validations.
+      --generate-pkg-zip             Generate a package ZIP file that you can use for debugging or to examine the
+                                     package contents.
       --language=<value>             Language for the package.
       --post-install-script=<value>  Name of the post-install script; applies to managed packages only.
       --post-install-url=<value>     Post-install instructions URL.
       --releasenotes-url=<value>     Release notes URL.
-      --skip-ancestor-check          Overrides ancestry requirements, which allows you to specify a package ancestor
-                                     that isn’t the highest released package version.
+      --skip-ancestor-check          Override ancestry requirements, which allows you to specify a package ancestor that
+                                     isn’t the highest released package version.
       --skip-validation              Skip validation during package version creation; you can’t promote unvalidated
                                      package versions.
       --uninstall-script=<value>     Uninstall script name; applies to managed packages only.
@@ -6924,7 +6798,7 @@ FLAG DESCRIPTIONS
     periods of no output from commands.
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/version/create.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/version/create.ts)_
 
 ## `sf package version create list`
 
@@ -6985,7 +6859,7 @@ EXAMPLES
     $ sf package version create list --created-last-days 0 --status Success
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/version/create/list.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/version/create/list.ts)_
 
 ## `sf package version create report`
 
@@ -7028,7 +6902,7 @@ EXAMPLES
     $ sf package version create report --package-create-request-id 08c... --target-dev-hub devhub@example.com
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/version/create/report.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/version/create/report.ts)_
 
 ## `sf package version delete`
 
@@ -7069,7 +6943,7 @@ EXAMPLES
     $ sf package version delete --package 04t... --target-org devhub@example.com
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/version/delete.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/version/delete.ts)_
 
 ## `sf package version displayancestry`
 
@@ -7129,7 +7003,7 @@ FLAG DESCRIPTIONS
     You can use the DOT code output in graph visualization software to create tree visualizations.
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/version/displayancestry.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/version/displayancestry.ts)_
 
 ## `sf package version displaydependencies`
 
@@ -7191,7 +7065,7 @@ FLAG DESCRIPTIONS
     package, which must be installed last.
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/version/displaydependencies.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/version/displaydependencies.ts)_
 
 ## `sf package version list`
 
@@ -7267,7 +7141,7 @@ EXAMPLES
     $ sf package version list --packages exp-mgr,exp-mgr-util --released --modified-last-days 0
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/version/list.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/version/list.ts)_
 
 ## `sf package version promote`
 
@@ -7311,7 +7185,7 @@ EXAMPLES
     $ sf package version promote --package "Awesome Package Alias"
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/version/promote.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/version/promote.ts)_
 
 ## `sf package version report`
 
@@ -7351,7 +7225,7 @@ EXAMPLES
     $ sf package version report --package "Your Package Alias" --target-dev-hub devhub@example.com
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/version/report.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/version/report.ts)_
 
 ## `sf package version retrieve`
 
@@ -7396,7 +7270,7 @@ EXAMPLES
     $ sf package version retrieve --package 04tXXX --output-dir my-directory/ --target-dev-hub devhub@example.com
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/version/retrieve.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/version/retrieve.ts)_
 
 ## `sf package version update`
 
@@ -7449,7 +7323,7 @@ EXAMPLES
     $ sf package version update --package 04t... --version-description "New Package Version Description"
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package/version/update.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package/version/update.ts)_
 
 ## `sf package1 version create`
 
@@ -7516,7 +7390,7 @@ FLAG DESCRIPTIONS
     subscribers.
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package1/version/create.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package1/version/create.ts)_
 
 ## `sf package1 version create get`
 
@@ -7549,7 +7423,7 @@ EXAMPLES
     $ sf package1 version create get --request-id 0HD... --target-org myorg@example.com
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package1/version/create/get.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package1/version/create/get.ts)_
 
 ## `sf package1 version display`
 
@@ -7583,7 +7457,7 @@ EXAMPLES
     $ sf package1 version display --package-version-id 04t... --target-org myorg@example.com
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package1/version/display.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package1/version/display.ts)_
 
 ## `sf package1 version list`
 
@@ -7621,7 +7495,7 @@ FLAG DESCRIPTIONS
     If not specified, shows all versions for all packages (managed and unmanaged) in the org.
 ```
 
-_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.24.11/src/commands/package1/version/list.ts)_
+_See code: [@salesforce/plugin-packaging](https://github.com/salesforcecli/plugin-packaging/blob/2.25.0/src/commands/package1/version/list.ts)_
 
 ## `sf plugins`
 
@@ -9256,7 +9130,7 @@ FLAG DESCRIPTIONS
     Override the api version used for api requests made by this command
 ```
 
-_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.4.7/src/commands/project/generate.ts)_
+_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.5.1/src/commands/project/generate.ts)_
 
 ## `sf project generate manifest`
 
@@ -10033,7 +9907,137 @@ FLAG DESCRIPTIONS
     etc.
 ```
 
-_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.4.7/src/commands/static-resource/generate.ts)_
+_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.5.1/src/commands/static-resource/generate.ts)_
+
+## `sf template generate apex class`
+
+Generate an Apex class.
+
+```
+USAGE
+  $ sf template generate apex class -n <value> [--json] [--flags-dir <value>] [-t
+    ApexException|ApexUnitTest|BasicUnitTest|DefaultApexClass|InboundEmailService] [-d <value>] [--api-version <value>]
+
+FLAGS
+  -d, --output-dir=<value>   [default: .] Directory for saving the created files.
+  -n, --name=<value>         (required) Name of the generated Apex class.
+  -t, --template=<option>    [default: DefaultApexClass] Template to use for file creation.
+                             <options: ApexException|ApexUnitTest|BasicUnitTest|DefaultApexClass|InboundEmailService>
+      --api-version=<value>  Override the api version used for api requests made by this command
+
+GLOBAL FLAGS
+  --flags-dir=<value>  Import flag values from a directory.
+  --json               Format output as json.
+
+DESCRIPTION
+  Generate an Apex class.
+
+  Generates the Apex *.cls file and associated metadata file. These files must be contained in a parent directory called
+  "classes" in your package directory. Either run this command from an existing directory of this name, or use the
+  --output-dir flag to generate one or point to an existing one.
+
+ALIASES
+  $ sf force apex class create
+  $ sf apex generate class
+
+EXAMPLES
+  Generate two metadata files associated with the MyClass Apex class (MyClass.cls and MyClass.cls-meta.xml) in the
+  current directory:
+
+    $ sf template generate apex class --name MyClass
+
+  Similar to previous example, but generates the files in the "force-app/main/default/classes" directory:
+
+    $ sf template generate apex class --name MyClass --output-dir force-app/main/default/classes
+
+FLAG DESCRIPTIONS
+  -d, --output-dir=<value>  Directory for saving the created files.
+
+    The location can be an absolute path or relative to the current working directory. The default is the current
+    directory.
+
+  -n, --name=<value>  Name of the generated Apex class.
+
+    The name can be up to 40 characters and must start with a letter.
+
+  -t, --template=ApexException|ApexUnitTest|BasicUnitTest|DefaultApexClass|InboundEmailService
+
+    Template to use for file creation.
+
+    Supplied parameter values or default values are filled into a copy of the template.
+```
+
+_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.5.1/src/commands/template/generate/apex/class.ts)_
+
+## `sf template generate apex trigger`
+
+Generate an Apex trigger.
+
+```
+USAGE
+  $ sf template generate apex trigger -n <value> [--json] [--flags-dir <value>] [-t ApexTrigger] [-d <value>] [--api-version
+    <value>] [-s <value>] [-e before insert|before update|before delete|after insert|after update|after delete|after
+    undelete...]
+
+FLAGS
+  -d, --output-dir=<value>   [default: .] Directory for saving the created files.
+  -e, --event=<option>...    [default: before insert] Events that fire the trigger.
+                             <options: before insert|before update|before delete|after insert|after update|after
+                             delete|after undelete>
+  -n, --name=<value>         (required) Name of the generated Apex trigger
+  -s, --sobject=<value>      [default: SOBJECT] Salesforce object to generate a trigger on.
+  -t, --template=<option>    [default: ApexTrigger] Template to use for file creation.
+                             <options: ApexTrigger>
+      --api-version=<value>  Override the api version used for api requests made by this command
+
+GLOBAL FLAGS
+  --flags-dir=<value>  Import flag values from a directory.
+  --json               Format output as json.
+
+DESCRIPTION
+  Generate an Apex trigger.
+
+  Generates the Apex trigger *.trigger file and associated metadata file. These files must be contained in a parent
+  directory called "triggers" in your package directory. Either run this command from an existing directory of this
+  name, or use the --output-dir flag to generate one or point to an existing one.
+
+  If you don't specify the --sobject flag, the .trigger file contains the generic placeholder SOBJECT; replace it with
+  the Salesforce object you want to generate a trigger for. If you don't specify --event, "before insert" is used.
+
+ALIASES
+  $ sf force apex trigger create
+  $ sf apex generate trigger
+
+EXAMPLES
+  Generate two files associated with the MyTrigger Apex trigger (MyTrigger.trigger and MyTrigger.trigger-meta.xml) in
+  the current directory:
+
+    $ sf template generate apex trigger --name MyTrigger
+
+  Similar to the previous example, but generate the files in the "force-app/main/default/triggers" directory:
+
+    $ sf template generate apex trigger --name MyTrigger --output-dir force-app/main/default/triggers
+
+  Generate files for a trigger that fires on the Account object before and after an insert:
+
+    $ sf template generate apex trigger --name MyTrigger --sobject Account --event "before insert,after insert"
+
+FLAG DESCRIPTIONS
+  -d, --output-dir=<value>  Directory for saving the created files.
+
+    The location can be an absolute path or relative to the current working directory. The default is the current
+    directory.
+
+  -n, --name=<value>  Name of the generated Apex trigger
+
+    The name can be up to 40 characters and must start with a letter.
+
+  -t, --template=ApexTrigger  Template to use for file creation.
+
+    Supplied parameter values or default values are filled into a copy of the template.
+```
+
+_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.5.1/src/commands/template/generate/apex/trigger.ts)_
 
 ## `sf update [CHANNEL]`
 
@@ -10147,7 +10151,7 @@ FLAG DESCRIPTIONS
     Supplied parameter values or default values are filled into a copy of the template.
 ```
 
-_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.4.7/src/commands/visualforce/generate/component.ts)_
+_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.5.1/src/commands/visualforce/generate/component.ts)_
 
 ## `sf visualforce generate page`
 
@@ -10197,7 +10201,7 @@ FLAG DESCRIPTIONS
     The name can be up to 40 characters and must start with a letter.
 ```
 
-_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.4.7/src/commands/visualforce/generate/page.ts)_
+_See code: [@salesforce/plugin-templates](https://github.com/salesforcecli/plugin-templates/blob/56.5.1/src/commands/visualforce/generate/page.ts)_
 
 ## `sf which`
 
diff --git a/package.json b/package.json
index 400e537a..836b1bd6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.123.0",
+  "version": "2.123.1",
   "author": "Salesforce",
   "bin": {
     "sf": "./bin/run.js",
@@ -167,12 +167,12 @@
     "@salesforce/plugin-limits": "3.3.74",
     "@salesforce/plugin-marketplace": "1.3.8",
     "@salesforce/plugin-org": "5.9.64",
-    "@salesforce/plugin-packaging": "2.24.11",
+    "@salesforce/plugin-packaging": "2.25.0",
     "@salesforce/plugin-schema": "3.3.90",
     "@salesforce/plugin-settings": "2.4.54",
     "@salesforce/plugin-sobject": "1.4.82",
     "@salesforce/plugin-telemetry": "3.6.71",
-    "@salesforce/plugin-templates": "56.4.7",
+    "@salesforce/plugin-templates": "56.5.1",
     "@salesforce/plugin-trust": "3.7.113",
     "@salesforce/plugin-user": "3.6.48",
     "@salesforce/sf-plugins-core": "12.2.6",
diff --git a/yarn.lock b/yarn.lock
index 87c1e729..6930735d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2380,10 +2380,10 @@
     open "^10.2.0"
     terminal-link "^3.0.0"
 
-"@salesforce/plugin-packaging@2.24.11":
-  version "2.24.11"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-packaging/-/plugin-packaging-2.24.11.tgz#c0efee7ad0ed5edad0b9352ea1b9b8c60ed63fae"
-  integrity sha512-xRzQO4cwndmh7T2jVNku2uKOILEL9u6ZbsyKzxnIX3Vr9H9FAdFo+oGpHscb2ZcYwc67JyxFLfnctCeByOLJ0A==
+"@salesforce/plugin-packaging@2.25.0":
+  version "2.25.0"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-packaging/-/plugin-packaging-2.25.0.tgz#e75a4bbef7c7893d1e025a904a7f11fd8340e739"
+  integrity sha512-gZ61IsV9Zpf/damLplXk1VzCC3jYwC7U69qTkqC7JZX/DJFML+46qu+i63qpAjin1opXrVCp5LUjNDUpnbsLpA==
   dependencies:
     "@oclif/core" "^4"
     "@salesforce/core" "^8.25.0"
@@ -2468,14 +2468,14 @@
     "@salesforce/ts-types" "^2.0.11"
     debug "^4.4.3"
 
-"@salesforce/plugin-templates@56.4.7":
-  version "56.4.7"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-templates/-/plugin-templates-56.4.7.tgz#40c170a331544aa2c34e74a99580f8cb95a1a364"
-  integrity sha512-HHFydBGkHCo/0m0Qp1eUTrxQSCE4eQ4PgqkWcog+nQmHHdATdd8m1So2NHG8bjNKXLWYobjuMEXzLcmiw+MlJw==
+"@salesforce/plugin-templates@56.5.1":
+  version "56.5.1"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-templates/-/plugin-templates-56.5.1.tgz#14090579bb437ff277f3c5d5cbe0ab78fc7574ed"
+  integrity sha512-UZaBrRFHn1NcWpJtFxX6TX22xSdc4DP4f+ZdkeOa71XlYkf6a5up00lCqxi3N+bx+9A0OKDxOSYW4uhPIrS1Zw==
   dependencies:
     "@salesforce/core" "^8.25.0"
     "@salesforce/sf-plugins-core" "^12"
-    "@salesforce/templates" "^65.4.3"
+    "@salesforce/templates" "^65.5.2"
 
 "@salesforce/plugin-trust@3.7.113", "@salesforce/plugin-trust@^3.7.69":
   version "3.7.113"
@@ -2594,12 +2594,14 @@
     got "^11"
     proxy-agent "^6.5.0"
 
-"@salesforce/templates@^65.4.3":
-  version "65.4.4"
-  resolved "https://registry.yarnpkg.com/@salesforce/templates/-/templates-65.4.4.tgz#e02ebe76b075580842884800738543969e576995"
-  integrity sha512-hQj6j4lVlW/otwnyZ4fAhogNbgoF0O6yRsIUpP7iXJEIF+awzFOa492Z+gbkIoShqNm/bGvY0zgzZD4eiCHzbw==
+"@salesforce/templates@^65.5.2":
+  version "65.5.2"
+  resolved "https://registry.yarnpkg.com/@salesforce/templates/-/templates-65.5.2.tgz#33dc497908c94cfb1b8ebd93f790e24d4775794b"
+  integrity sha512-SBlyOPmzc3/+/LmeN7q62/cRTBeLI3g3O6I4JQPzvXuyzdUHs71NYLopQN35lV75BceF3WYKnV3+p/eTIp8Okg==
   dependencies:
     "@salesforce/kit" "^3.2.4"
+    "@salesforce/webapp-template-base-react-app-experimental" "^1.3.5"
+    "@salesforce/webapp-template-base-web-app-experimental" "^1.3.5"
     ejs "^3.1.10"
     got "^11.8.6"
     hpagent "^1.2.0"
@@ -2627,6 +2629,16 @@
   resolved "https://registry.yarnpkg.com/@salesforce/types/-/types-1.6.0.tgz#926515ce3f6b16c8efe2afcc86475001d419c6cc"
   integrity sha512-UHk1L3QRaa3WfIqQn5RLmcZmxErXvpFPUteLLgIxlFLrxhcKevvEwkMJF2xNIHpfT4Xj7PcYvqtrRYapX4Pp+A==
 
+"@salesforce/webapp-template-base-react-app-experimental@^1.3.5":
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/@salesforce/webapp-template-base-react-app-experimental/-/webapp-template-base-react-app-experimental-1.15.0.tgz#0e2418a865a2ae9192a243217c8b098f4ee344b7"
+  integrity sha512-sa93gqxFOcvEvCa0dBRpjlB2fsBtqQfHN9YhPftNxXPD52AZgFQgMxULv79XdVCiVz9nYTSRURkgRVbleSIkmw==
+
+"@salesforce/webapp-template-base-web-app-experimental@^1.3.5":
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/@salesforce/webapp-template-base-web-app-experimental/-/webapp-template-base-web-app-experimental-1.15.0.tgz#248acc61c170d9c63ace0f1049acf9f201947906"
+  integrity sha512-PoG77d1JebSK5MmjwIrxTnxKsXpA2sdiG4uFts9YbFJ3dwrqOe2u04t8OA9Vt/G/Gg2TDbXmR4VBzurNGi2sAA==
+
 "@shikijs/core@1.29.2":
   version "1.29.2"
   resolved "https://registry.yarnpkg.com/@shikijs/core/-/core-1.29.2.tgz#9c051d3ac99dd06ae46bd96536380c916e552bf3"