diff --git a/charts/icm-replication/.bumpversion.toml b/charts/icm-replication/.bumpversion.toml
index 7501e4fc..65836428 100644
--- a/charts/icm-replication/.bumpversion.toml
+++ b/charts/icm-replication/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.5.0"
+current_version = "2.5.1"
 
 [[tool.bumpversion.files]]
 filename = "Chart.yaml"
diff --git a/charts/icm-replication/CHANGELOG.md b/charts/icm-replication/CHANGELOG.md
index d3deacd4..0fa17606 100644
--- a/charts/icm-replication/CHANGELOG.md
+++ b/charts/icm-replication/CHANGELOG.md
@@ -1,4 +1,28 @@
 
+<a name="icm-replication-2.5.1"></a>
+## [icm-replication-2.5.1](https://github.com/intershop/helm-charts/compare/icm-replication-2.5.0...icm-replication-2.5.1)
+
+> 2024-08-26
+
+### Chore
+
+* bump versions of icm:patch icm-replication:patch
+
+### Fix
+
+* **icm:** no command overwrite in wa and waa ([#793](https://github.com/intershop/helm-charts/issues/793))
+
+
+<a name="icm-replication-2.5.0"></a>
+## [icm-replication-2.5.0](https://github.com/intershop/helm-charts/compare/icm-replication-2.4.0...icm-replication-2.5.0)
+
+> 2024-08-12
+
+### Chore
+
+* bump versions of icm-as:minor icm-web:minor
+
+
 <a name="icm-replication-2.4.0"></a>
 ## [icm-replication-2.4.0](https://github.com/intershop/helm-charts/compare/icm-replication-2.3.0...icm-replication-2.4.0)
 
@@ -6,6 +30,7 @@
 
 ### Chore
 
+* generated changelog+release notes for icm:minor icm-replication:minor
 * bump versions of icm:minor icm-replication:minor
 
 ### Feat
diff --git a/charts/icm-replication/Chart.yaml b/charts/icm-replication/Chart.yaml
index 9410623e..a9bc02aa 100644
--- a/charts/icm-replication/Chart.yaml
+++ b/charts/icm-replication/Chart.yaml
@@ -3,16 +3,16 @@ appVersion: "11.9.0"
 description: Intershop Commerce Management - ICM Replication
 # name and version must be in this exact order, otherwise bump2version won't work
 name: icm-replication
-version: 2.5.0
+version: 2.5.1
 annotations:
   requestedMemoryQuota: 9Gi
   requestedCpuQuotaInMinutes: 3000
 dependencies:
   - name: icm
-    version: 2.5.0
+    version: 2.5.1
     repository: file://../icm
     alias: icm-live
   - name: icm
-    version: 2.5.0
+    version: 2.5.1
     repository: file://../icm
     alias: icm-edit
diff --git a/charts/icm-replication/RELEASE_NOTES.md b/charts/icm-replication/RELEASE_NOTES.md
index 76bebb10..cadb2dc6 100644
--- a/charts/icm-replication/RELEASE_NOTES.md
+++ b/charts/icm-replication/RELEASE_NOTES.md
@@ -1,14 +1,14 @@
 
-<a name="icm-replication-2.4.0"></a>
-## [icm-replication-2.4.0](https://github.com/intershop/helm-charts/compare/icm-replication-2.3.0...icm-replication-2.4.0)
+<a name="icm-replication-2.5.1"></a>
+## [icm-replication-2.5.1](https://github.com/intershop/helm-charts/compare/icm-replication-2.5.0...icm-replication-2.5.1)
 
-> 2024-08-05
+> 2024-08-26
 
 ### Chore
 
-* bump versions of icm:minor icm-replication:minor
+* bump versions of icm:patch icm-replication:patch
 
-### Feat
+### Fix
 
-* **icm:** prevent test abortions ([#775](https://github.com/intershop/helm-charts/issues/775))
+* **icm:** no command overwrite in wa and waa ([#793](https://github.com/intershop/helm-charts/issues/793))
 
diff --git a/charts/icm-replication/values-iste_linux.tmpl b/charts/icm-replication/values-iste_linux.tmpl
index 2aa64ea8..cb276b13 100644
--- a/charts/icm-replication/values-iste_linux.tmpl
+++ b/charts/icm-replication/values-iste_linux.tmpl
@@ -92,19 +92,9 @@ icm-edit:
         "cluster-autoscaler.kubernetes.io/safe-to-evict": "false"
       image:
         repository: "${ICM_WEBSERVER_IMAGE}"
-        command: |
-          mkdir -p $HELM_DIRECTORY/server-logs-edit
-          chown -R ${SERVER_DIRECTORY_USER}:${SERVER_DIRECTORY_GROUP} ${HELM_DIRECTORY}/server-logs-edit
-          timestamp=$(date '+%Y-%m-%d_%H_%M_%S')
-          su ${SERVER_DIRECTORY_USER} -c "/intershop/bin/intershop.sh 2>&1 | tee outfile $HELM_DIRECTORY/server-logs-edit/wa${timestamp}.log"
     agent:
       image:
         repository: "${ICM_WEBADAPTER_AGENT_IMAGE}"
-        command: |
-          mkdir -p $HELM_DIRECTORY/server-logs-edit
-          chown -R ${SERVER_DIRECTORY_USER}:${SERVER_DIRECTORY_GROUP} ${HELM_DIRECTORY}/server-logs-edit
-          timestamp=$(date '+%Y-%m-%d_%H_%M_%S')
-          su ${SERVER_DIRECTORY_USER} -c "/intershop/bin/start-waa.sh 2>&1 | tee outfile $HELM_DIRECTORY/server-logs-edit/waa${timestamp}.log"
     podSecurityContext:
       runAsUser: 0
       runAsGroup: 0
@@ -235,19 +225,9 @@ icm-live:
         "cluster-autoscaler.kubernetes.io/safe-to-evict": "false"
       image:
         repository: "${ICM_WEBSERVER_IMAGE}"
-        command: |
-          mkdir -p $HELM_DIRECTORY/server-logs-live
-          chown -R ${SERVER_DIRECTORY_USER}:${SERVER_DIRECTORY_GROUP} ${HELM_DIRECTORY}/server-logs-live
-          timestamp=$(date '+%Y-%m-%d_%H_%M_%S')
-          su ${SERVER_DIRECTORY_USER} -c "/intershop/bin/intershop.sh 2>&1 | tee outfile $HELM_DIRECTORY/server-logs-live/wa${timestamp}.log"
     agent:
       image:
         repository: "${ICM_WEBADAPTER_AGENT_IMAGE}"
-        command: |
-          mkdir -p $HELM_DIRECTORY/server-logs-live
-          chown -R ${SERVER_DIRECTORY_USER}:${SERVER_DIRECTORY_GROUP} ${HELM_DIRECTORY}/server-logs-live
-          timestamp=$(date '+%Y-%m-%d_%H_%M_%S')
-          su ${SERVER_DIRECTORY_USER} -c "/intershop/bin/start-waa.sh 2>&1 | tee outfile $HELM_DIRECTORY/server-logs-live/waa${timestamp}.log"
     podSecurityContext:
       runAsUser: 0
       runAsGroup: 0
diff --git a/charts/icm/.bumpversion.toml b/charts/icm/.bumpversion.toml
index b39c3952..65e8b196 100644
--- a/charts/icm/.bumpversion.toml
+++ b/charts/icm/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.5.0"
+current_version = "2.5.1"
 
 [[tool.bumpversion.files]]
 filename = "Chart.yaml"
diff --git a/charts/icm/CHANGELOG.md b/charts/icm/CHANGELOG.md
index 8af88cc4..a7462096 100644
--- a/charts/icm/CHANGELOG.md
+++ b/charts/icm/CHANGELOG.md
@@ -1,4 +1,28 @@
 
+<a name="icm-2.5.1"></a>
+## [icm-2.5.1](https://github.com/intershop/helm-charts/compare/icm-2.5.0...icm-2.5.1)
+
+> 2024-08-26
+
+### Chore
+
+* bump versions of icm:patch icm-replication:patch
+
+### Fix
+
+* **icm:** no command overwrite in wa and waa ([#793](https://github.com/intershop/helm-charts/issues/793))
+
+
+<a name="icm-2.5.0"></a>
+## [icm-2.5.0](https://github.com/intershop/helm-charts/compare/icm-2.4.0...icm-2.5.0)
+
+> 2024-08-12
+
+### Chore
+
+* bump versions of icm-as:minor icm-web:minor
+
+
 <a name="icm-2.4.0"></a>
 ## [icm-2.4.0](https://github.com/intershop/helm-charts/compare/icm-2.3.0...icm-2.4.0)
 
@@ -6,6 +30,7 @@
 
 ### Chore
 
+* generated changelog+release notes for icm:minor icm-replication:minor
 * bump versions of icm:minor icm-replication:minor
 
 ### Feat
diff --git a/charts/icm/Chart.yaml b/charts/icm/Chart.yaml
index fe02bf26..bee7681e 100644
--- a/charts/icm/Chart.yaml
+++ b/charts/icm/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "12.0.0"
 description: Intershop Commerce Management - ICM
 # name and version must be in this exact order, otherwise bump2version won't work
 name: icm
-version: 2.5.0
+version: 2.5.1
 # test related annotations
 annotations:
   requestedMemoryQuota: 6000Mi
diff --git a/charts/icm/RELEASE_NOTES.md b/charts/icm/RELEASE_NOTES.md
index e81a3879..937d5974 100644
--- a/charts/icm/RELEASE_NOTES.md
+++ b/charts/icm/RELEASE_NOTES.md
@@ -1,14 +1,14 @@
 
-<a name="icm-2.4.0"></a>
-## [icm-2.4.0](https://github.com/intershop/helm-charts/compare/icm-2.3.0...icm-2.4.0)
+<a name="icm-2.5.1"></a>
+## [icm-2.5.1](https://github.com/intershop/helm-charts/compare/icm-2.5.0...icm-2.5.1)
 
-> 2024-08-05
+> 2024-08-26
 
 ### Chore
 
-* bump versions of icm:minor icm-replication:minor
+* bump versions of icm:patch icm-replication:patch
 
-### Feat
+### Fix
 
-* **icm:** prevent test abortions ([#775](https://github.com/intershop/helm-charts/issues/775))
+* **icm:** no command overwrite in wa and waa ([#793](https://github.com/intershop/helm-charts/issues/793))
 
diff --git a/charts/icm/values-iste_linux.tmpl b/charts/icm/values-iste_linux.tmpl
index 44d63868..7c0e0ec8 100644
--- a/charts/icm/values-iste_linux.tmpl
+++ b/charts/icm/values-iste_linux.tmpl
@@ -91,19 +91,9 @@ icm-web:
       "cluster-autoscaler.kubernetes.io/safe-to-evict": "false"
     image:
       repository: "${ICM_WEBSERVER_IMAGE}"
-      command: |
-        mkdir -p $HELM_DIRECTORY/server-logs
-        chown -R ${SERVER_DIRECTORY_USER}:${SERVER_DIRECTORY_GROUP} ${HELM_DIRECTORY}/server-logs
-        timestamp=$(date '+%Y-%m-%d_%H_%M_%S')
-        su ${SERVER_DIRECTORY_USER} -c "/intershop/bin/intershop.sh 2>&1 | tee outfile $HELM_DIRECTORY/server-logs/wa${timestamp}.log"
   agent:
     image:
       repository: "${ICM_WEBADAPTER_AGENT_IMAGE}"
-      command: |
-        mkdir -p $HELM_DIRECTORY/server-logs
-        chown -R ${SERVER_DIRECTORY_USER}:${SERVER_DIRECTORY_GROUP} ${HELM_DIRECTORY}/server-logs
-        timestamp=$(date '+%Y-%m-%d_%H_%M_%S')
-        su ${SERVER_DIRECTORY_USER} -c "/intershop/bin/start-waa.sh 2>&1 | tee outfile $HELM_DIRECTORY/server-logs/waa${timestamp}.log"
   podSecurityContext:
     runAsUser: 0
     runAsGroup: 0