diff --git a/Dockerfile b/Dockerfile
index 35ba254..342b7c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,11 +12,12 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
     GIT_BRANCH=${GIT_BRANCH} \
     BUILD_SOURCE=${BUILD_SOURCE}
 
-# Install system dependencies including PostgreSQL client libraries
+# Install system dependencies including PostgreSQL client libraries and tini
 RUN apt-get update && apt-get install -y \
     curl \
     libpq-dev \
     gcc \
+    tini \
     && rm -rf /var/lib/apt/lists/*
 
 # Create app user and directory
@@ -67,5 +68,8 @@ HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
 # Expose port
 EXPOSE 8080
 
+# Use tini as init process to handle signals and zombie processes properly
+ENTRYPOINT ["tini", "--"]
+
 # Run the application with plugin deployment
 CMD ["/app/deploy-plugin.sh"]
\ No newline at end of file
diff --git a/VERSION b/VERSION
index 8389c48..05f68fc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.24
+2.2.25
diff --git a/docker-compose.example b/docker-compose.example
index 5f760b2..6f2ec80 100644
--- a/docker-compose.example
+++ b/docker-compose.example
@@ -16,6 +16,10 @@ services:
     # Restart policy
     restart: unless-stopped
     
+    # Graceful shutdown configuration
+    stop_grace_period: 30s
+    stop_signal: SIGTERM
+    
     # Environment files
     env_file:
       - .env