diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a2d299f..bb4296d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,10 +7,8 @@ on:
       - main
 
 jobs:
-  publish:
+  build-and-publish:
     runs-on: ubuntu-latest
-
-    if: github.ref == 'refs/heads/main'
     
     steps:
       - name: Checkout
diff --git a/scripts/build-devtools.ts b/scripts/build-devtools.ts
index fcbce55..29ff3f4 100644
--- a/scripts/build-devtools.ts
+++ b/scripts/build-devtools.ts
@@ -15,6 +15,13 @@ rmSync(DIST_PATH, { recursive: true, force: true });
 // Ensure dist directory exists
 mkdirSync(DIST_PATH, { recursive: true });
 
+// Build plugin
+console.log('Building plugin...');
+execSync('pnpm build', {
+  cwd: PLUGIN_PATH,
+  stdio: 'inherit',
+});
+
 // Build devtools ui
 console.log('Building devtools...');
 execSync('pnpm build', {
@@ -31,13 +38,6 @@ cpSync(join(UI_PATH, 'lib-types'), join(DIST_PATH, 'ui', 'lib-types'), {
   recursive: true,
 });
 
-// Build plugin
-console.log('Building plugin...');
-execSync('pnpm build', {
-  cwd: PLUGIN_PATH,
-  stdio: 'inherit',
-});
-
 console.log('Copying plugin files to dist...');
 cpSync(join(PLUGIN_PATH, 'dist'), join(DIST_PATH, 'plugin'), {
   recursive: true,