diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
deleted file mode 100644
index 8a8f611..0000000
--- a/.github/workflows/ci-build.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Reusable CI Build Workflow
-
-on:
-  workflow_call:
-    inputs:
-      node-version:
-        required: false
-        type: string
-        default: 24
-
-permissions:
-  contents: read
-
-jobs:
-  ci-build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ inputs.node-version }}
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build
-        run: npm run build
-
-      - name: Test
-        run: npm run test:ci
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
index 3945447..75e1be2 100644
--- a/.github/workflows/default.yml
+++ b/.github/workflows/default.yml
@@ -5,6 +5,13 @@ on:
     branches-ignore:
       - main
 
+permissions:
+  contents: write
+  id-token: write
+
 jobs:
-  build:
-    uses: ./.github/workflows/ci-build.yml
+  ci:
+    uses: amerani/cicd/.github/workflows/ci-npm.yml@main
+    secrets: inherit
+    with:
+      test: npm run test:ci
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2a8c5b4..acf3457 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,39 +5,14 @@ on:
     branches:
       - main
 
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      id-token: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ inputs.node-version }}
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build
-        run: npm run build
-
-      - name: Test
-        run: npm run test:ci
-
-      - name: Release
-        uses: changesets/action@v1
-        with:
-          publish: npm run release
-          setupGitUser: false
-          commitMode: github-api
-        env:
-           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+permissions:
+  contents: write
+  id-token: write
 
+jobs:
+  cd:
+    uses: amerani/cicd/.github/workflows/cd-npm.yml@main   
+    secrets: inherit
+    with:
+      test: npm run test:ci
+      publish: npm run release
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3362a5a..61cfef4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # react-json-chunked
 
+## 0.3.8
+
+### Patch Changes
+
+- uses amerani/cicd templates
+
 ## 0.3.7
 
 ### Patch Changes
diff --git a/package.json b/package.json
index ad0cc18..bece0ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-json-chunked",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "A React component for streaming JSON using chunked Transfer-Encoding",
   "type": "module",
   "files": [