diff --git a/.github/workflows/lint_and_test_cpp.yaml b/.github/workflows/lint_and_test_cpp.yaml
index bde8e1f674..88aa2db9d6 100644
--- a/.github/workflows/lint_and_test_cpp.yaml
+++ b/.github/workflows/lint_and_test_cpp.yaml
@@ -93,10 +93,16 @@ jobs:
           ccache -z
           ./run.sh build --test --skip_thirdparty -j $(nproc) -t release
           ccache -s
+      - name: Pack Server
+        if: steps.changes.outputs.base == 'true' || steps.changes.outputs.src == 'true' || steps.changes.outputs.thirdparty == 'true'
+        run: ./run.sh pack_server
+      - name: Pack Tools
+        if: steps.changes.outputs.base == 'true' || steps.changes.outputs.src == 'true' || steps.changes.outputs.thirdparty == 'true'
+        run: ./run.sh pack_tools
       - name: Tar files
         run: |
           rm -rf thirdparty
-          tar -zcvhf release__builder.tar DSN_ROOT/ src/builder/bin src/builder/src/server/test/config.ini src/builder/src/rdsn/src/utils/libdsn_utils.so src/builder/src/rdsn/src/replica/libdsn_replica_server.so src/builder/src/rdsn/src/meta/libdsn_meta_server.so src/builder/src/client_lib/libpegasus_client_shared.so --exclude='*CMakeFiles*'
+          tar -zcvhf release__builder.tar DSN_ROOT/ src/builder/bin src/builder/src/server/test/config.ini  --exclude='*CMakeFiles*'
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
@@ -203,7 +209,7 @@ jobs:
       - name: Tar files
         run: |
           rm -rf thirdparty
-          tar -zcvhf release_address_builder.tar DSN_ROOT/ src/builder/bin src/builder/src/server/test/config.ini src/builder/src/rdsn/src/utils/libdsn_utils.so src/builder/src/rdsn/src/replica/libdsn_replica_server.so src/builder/src/rdsn/src/meta/libdsn_meta_server.so src/builder/src/client_lib/libpegasus_client_shared.so --exclude='*CMakeFiles*'
+          tar -zcvhf release_address_builder.tar DSN_ROOT/ src/builder/bin src/builder/src/server/test/config.ini  --exclude='*CMakeFiles*'
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
@@ -310,7 +316,7 @@ jobs:
       - name: Tar files
         run: |
           rm -rf thirdparty
-          tar -zcvhf release_undefined_builder.tar DSN_ROOT/ src/builder/bin src/builder/src/server/test/config.ini src/builder/src/rdsn/src/utils/libdsn_utils.so src/builder/src/rdsn/src/replica/libdsn_replica_server.so src/builder/src/rdsn/src/meta/libdsn_meta_server.so src/builder/src/client_lib/libpegasus_client_shared.so --exclude='*CMakeFiles*'
+          tar -zcvhf release_undefined_builder.tar DSN_ROOT/ src/builder/bin src/builder/src/server/test/config.ini  --exclude='*CMakeFiles*'
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
diff --git a/.gitignore b/.gitignore
index 934806e334..c7cc60c705 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,11 +18,10 @@
 src/.matchfile
 src/base/rrdb_types.cpp
 src/include/rrdb/rrdb_types.h
-src/rdsn/builder/
 src/rdsn/include/dsn/cpp/serialization_helper/dsn.layer2_types.h
 src/rdsn/src/runtime/dsn.layer2_types.cpp
 src/runtime
-src/builder
+src/*builder
 
 onebox/
 .zk_install/