diff --git a/popular_actions.go b/popular_actions.go
index 60cc2b0f1..4da9198cc 100644
--- a/popular_actions.go
+++ b/popular_actions.go
@@ -847,17 +847,21 @@ var PopularActions = map[string]*ActionMetadata{
 	"actions/create-github-app-token@v3": {
 		Name: "Create GitHub App Token",
 		Inputs: ActionMetadataInputs{
-			"app-id":                    {"app-id", true, false, ""},
-			"github-api-url":            {"github-api-url", false, false, ""},
-			"owner":                     {"owner", false, false, ""},
-			"permission-actions":        {"permission-actions", false, false, ""},
-			"permission-administration": {"permission-administration", false, false, ""},
-			"permission-checks":         {"permission-checks", false, false, ""},
-			"permission-codespaces":     {"permission-codespaces", false, false, ""},
-			"permission-contents":       {"permission-contents", false, false, ""},
+			"app-id":                       {"app-id", false, true, "Use 'client-id' instead."},
+			"client-id":                    {"client-id", false, false, ""},
+			"github-api-url":               {"github-api-url", false, false, ""},
+			"owner":                        {"owner", false, false, ""},
+			"permission-actions":           {"permission-actions", false, false, ""},
+			"permission-administration":    {"permission-administration", false, false, ""},
+			"permission-artifact-metadata": {"permission-artifact-metadata", false, false, ""},
+			"permission-attestations":      {"permission-attestations", false, false, ""},
+			"permission-checks":            {"permission-checks", false, false, ""},
+			"permission-codespaces":        {"permission-codespaces", false, false, ""},
+			"permission-contents":          {"permission-contents", false, false, ""},
 			"permission-custom-properties-for-organizations":            {"permission-custom-properties-for-organizations", false, false, ""},
 			"permission-dependabot-secrets":                             {"permission-dependabot-secrets", false, false, ""},
 			"permission-deployments":                                    {"permission-deployments", false, false, ""},
+			"permission-discussions":                                    {"permission-discussions", false, false, ""},
 			"permission-email-addresses":                                {"permission-email-addresses", false, false, ""},
 			"permission-enterprise-custom-properties-for-organizations": {"permission-enterprise-custom-properties-for-organizations", false, false, ""},
 			"permission-environments":                                   {"permission-environments", false, false, ""},
@@ -867,6 +871,7 @@ var PopularActions = map[string]*ActionMetadata{
 			"permission-interaction-limits":                             {"permission-interaction-limits", false, false, ""},
 			"permission-issues":                                         {"permission-issues", false, false, ""},
 			"permission-members":                                        {"permission-members", false, false, ""},
+			"permission-merge-queues":                                   {"permission-merge-queues", false, false, ""},
 			"permission-metadata":                                       {"permission-metadata", false, false, ""},
 			"permission-organization-administration":                    {"permission-organization-administration", false, false, ""},
 			"permission-organization-announcement-banners":              {"permission-organization-announcement-banners", false, false, ""},
diff --git a/testdata/ok/issue-648-create-github-app-token-client-id.yaml b/testdata/ok/issue-648-create-github-app-token-client-id.yaml
new file mode 100644
index 000000000..4468bb3af
--- /dev/null
+++ b/testdata/ok/issue-648-create-github-app-token-client-id.yaml
@@ -0,0 +1,10 @@
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/create-github-app-token@v3
+        with:
+          client-id: ${{ vars.APP_CLIENT_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}