diff --git a/.github/workflows/scaffold-module.yaml b/.github/workflows/scaffold-module.yaml
index ed8f2b22d..d1d951e68 100644
--- a/.github/workflows/scaffold-module.yaml
+++ b/.github/workflows/scaffold-module.yaml
@@ -7,9 +7,17 @@ on:
       module_path:
         description: 'module path'
         required: true
+      template_dir:
+        type: choice
+        default: templates/module-hello
+        options:
+          - templates/module-hello
 jobs:
   scaffold:
     runs-on: ubuntu-latest
+    env:
+      TFACTION_MODULE_PATH: ${{inputs.module_path}}
+      TFACTION_MODULE_TEMPLATE_DIR: ${{inputs.template_dir}}
     permissions:
       contents: read
     steps:
@@ -38,5 +46,8 @@ jobs:
 
       - uses: suzuki-shunsuke/tfaction/scaffold-module@pr/1291
         with:
-          github_token: ${{ steps.generate_token.outputs.token }}
-          module_path: ${{ github.event.inputs.module_path }}
+          github_token: ${{steps.generate_token.outputs.token}}
+
+      - uses: suzuki-shunsuke/tfaction/create-scaffold-module-pr@pr/1291
+        with:
+          github_token: ${{steps.generate_token.outputs.token}}