diff --git a/.github/workflows/claude-code-review.yml b/.github/workflows/claude-code-review.yml
index 20e1f9f..f6b5808 100644
--- a/.github/workflows/claude-code-review.yml
+++ b/.github/workflows/claude-code-review.yml
@@ -2,7 +2,7 @@ name: Claude Code Review
 
 on:
   pull_request:
-    types: [opened, synchronize]
+    types: [opened]
 
 jobs:
   claude-review:
diff --git a/.gitignore b/.gitignore
index 405c8ce..d7d6bfa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -143,6 +143,8 @@ modules.xml
 # Sonarlint plugin
 .idea/sonarlint
 
+CLAUDE.md
+
 ### Kotlin ###
 # Compiled class file
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 1bca65c..bfd1672 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 plugins {
     kotlin("jvm") version "2.2.21"
     application
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("com.gradleup.shadow") version "9.3.0"
     id("org.jlleitschuh.gradle.ktlint") version "14.0.1"
     id("io.gitlab.arturbosch.detekt") version "1.23.8"
     id("net.nemerosa.versioning") version "3.1.0"
@@ -89,10 +89,6 @@ kotlin {
     jvmToolchain(21)
 }
 
-tasks.withType<ProcessResources> {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-}
-
 tasks.withType<Test>().configureEach {
     useJUnitPlatform()
 }
@@ -100,6 +96,7 @@ tasks.withType<Test>().configureEach {
 tasks {
     named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
         mergeServiceFiles()
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
         archiveBaseName = "poll-app"
     }
     build {
diff --git a/helm/pollapp/templates/pvc.yaml b/helm/pollapp/templates/pvc.yaml
index f61bb33..4289caa 100644
--- a/helm/pollapp/templates/pvc.yaml
+++ b/helm/pollapp/templates/pvc.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ include "pollapp.fullname" . }}-pvc
+  annotations:
+    "helm.sh/resource-policy": keep
   labels:
     {{- include "pollapp.labels" . | nindent 4 }}
 spec:
diff --git a/helm/pollapp/templates/deployment.yaml b/helm/pollapp/templates/statefulset.yaml
similarity index 98%
rename from helm/pollapp/templates/deployment.yaml
rename to helm/pollapp/templates/statefulset.yaml
index 857d786..4d83032 100644
--- a/helm/pollapp/templates/deployment.yaml
+++ b/helm/pollapp/templates/statefulset.yaml
@@ -1,10 +1,11 @@
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: {{ include "pollapp.fullname" . }}
   labels:
     {{- include "pollapp.labels" . | nindent 4 }}
 spec:
+  serviceName: {{ include "pollapp.fullname" . }}
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels: