diff --git a/.github/workflows/node-api-ci.yaml b/.github/workflows/node-api-ci.yaml
index 1398894..12fedb0 100644
--- a/.github/workflows/node-api-ci.yaml
+++ b/.github/workflows/node-api-ci.yaml
@@ -62,11 +62,3 @@ jobs:
           tags: |
             ${{ env.IMAGE_NAME }}:main
             ${{ env.IMAGE_NAME }}:${{ github.sha }}
-
-      - name: Build Docker image for pull requests
-        if: github.event_name == 'pull_request'
-        uses: docker/build-push-action@v6
-        with:
-          context: services/node-api
-          push: false
-          tags: ${{ env.IMAGE_NAME }}:pr-${{ github.event.pull_request.number }}
diff --git a/.github/workflows/node-api-cleanup.yaml b/.github/workflows/node-api-cleanup.yaml
new file mode 100644
index 0000000..1f35a48
--- /dev/null
+++ b/.github/workflows/node-api-cleanup.yaml
@@ -0,0 +1,40 @@
+name: node-api-preview-cleanup
+
+on:
+  pull_request:
+    types:
+      - closed
+
+permissions:
+  contents: write
+  pull-requests: read
+
+jobs:
+  cleanup-preview:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout main for GitOps cleanup
+        uses: actions/checkout@v4
+        with:
+          ref: main
+
+      - name: Remove preview application
+        run: |
+          PR_NUMBER="${{ github.event.pull_request.number }}"
+          rm -f "previews/node-api/pr-${PR_NUMBER}.yaml"
+
+      - name: Commit preview cleanup
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+          git add "previews/node-api/pr-${{ github.event.pull_request.number }}.yaml"
+
+          if git diff --cached --quiet; then
+            echo "No preview cleanup changes to commit"
+            exit 0
+          fi
+
+          git commit -m "Remove node-api preview for PR #${{ github.event.pull_request.number }}"
+          git push origin HEAD:main
diff --git a/.github/workflows/node-api-preview.yaml b/.github/workflows/node-api-preview.yaml
index 95be0b8..02d0386 100644
--- a/.github/workflows/node-api-preview.yaml
+++ b/.github/workflows/node-api-preview.yaml
@@ -6,6 +6,7 @@ on:
       - opened
       - synchronize
       - reopened
+    
     paths:
       - services/node-api/**
       - .github/workflows/node-api-preview.yaml
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/services/.DS_Store b/services/.DS_Store
deleted file mode 100644
index 11e20a0..0000000
Binary files a/services/.DS_Store and /dev/null differ
diff --git a/services/node-api/.DS_Store b/services/node-api/.DS_Store
deleted file mode 100644
index 1ed3de6..0000000
Binary files a/services/node-api/.DS_Store and /dev/null differ