diff --git a/charts/hummerrisk/templates/job-flywya.yaml b/charts/hummerrisk/templates/job-flyway.yaml
similarity index 96%
rename from charts/hummerrisk/templates/job-flywya.yaml
rename to charts/hummerrisk/templates/job-flyway.yaml
index acf8a17..a626703 100644
--- a/charts/hummerrisk/templates/job-flywya.yaml
+++ b/charts/hummerrisk/templates/job-flyway.yaml
@@ -6,7 +6,7 @@ spec:
   template:
     spec:
       restartPolicy: OnFailure
-      terminationGracePeriodSeconds: 60
+      terminationGracePeriodSeconds: 30
       containers:
         - name: flyway
           image: "{{ .Values.global.imageRegistry }}/hummerrisk/hmr-flyway:{{ .Values.hummerrisk.image.tag }}"
diff --git a/charts/hummerrisk/templates/mysql/configmap-init.yaml b/charts/hummerrisk/templates/mysql/configmap-init.yaml
index 48d9452..d8e738f 100644
--- a/charts/hummerrisk/templates/mysql/configmap-init.yaml
+++ b/charts/hummerrisk/templates/mysql/configmap-init.yaml
@@ -5,6 +5,8 @@ kind: ConfigMap
 metadata:
   name: hummerrisk-mysql-init
   namespace: {{ .Release.Namespace | quote }}
+  annotations:
+    "helm.sh/hook": pre-install
   labels:
     app.kubernetes.io/name: mysql
 data:
diff --git a/charts/hummerrisk/templates/mysql/configmap-mysql.yaml b/charts/hummerrisk/templates/mysql/configmap-mysql.yaml
index 50f59c8..1ef9e29 100644
--- a/charts/hummerrisk/templates/mysql/configmap-mysql.yaml
+++ b/charts/hummerrisk/templates/mysql/configmap-mysql.yaml
@@ -5,6 +5,8 @@ kind: ConfigMap
 metadata:
   name: hummerrisk-mysql-config
   namespace: {{ .Release.Namespace | quote }}
+  annotations:
+    "helm.sh/hook": pre-install
   labels:
     app.kubernetes.io/name: mysql
 data:
diff --git a/charts/hummerrisk/templates/mysql/mysql-deploy.yaml b/charts/hummerrisk/templates/mysql/mysql-deploy.yaml
index e74f055..8441bfe 100644
--- a/charts/hummerrisk/templates/mysql/mysql-deploy.yaml
+++ b/charts/hummerrisk/templates/mysql/mysql-deploy.yaml
@@ -6,6 +6,8 @@ kind: Service
 metadata:
   name: {{ $fullName }}-mysql
   namespace: {{ .Release.Namespace | quote }}
+  annotations:
+    "helm.sh/hook": pre-install
   labels:
     app.kubernetes.io/name: mysql
 spec:
diff --git a/charts/hummerrisk/templates/mysql/pvc-mysql.yaml b/charts/hummerrisk/templates/mysql/pvc-mysql.yaml
index f78f73d..2214110 100644
--- a/charts/hummerrisk/templates/mysql/pvc-mysql.yaml
+++ b/charts/hummerrisk/templates/mysql/pvc-mysql.yaml
@@ -5,6 +5,8 @@ apiVersion: v1
 metadata:
   name: {{ $pvcFullName }}-mysql
   namespace: {{ .Release.Namespace | quote }}
+  annotations:
+    "helm.sh/hook": pre-install
   annotations:
     volume.beta.kubernetes.io/storage-class: {{ .Values.global.storageClass | quote }}
 spec:
diff --git a/charts/hummerrisk/templates/mysql/secret-mysql.yaml b/charts/hummerrisk/templates/mysql/secret-mysql.yaml
index 4424975..f411ca8 100644
--- a/charts/hummerrisk/templates/mysql/secret-mysql.yaml
+++ b/charts/hummerrisk/templates/mysql/secret-mysql.yaml
@@ -6,6 +6,8 @@ kind: Secret
 metadata:
   name: hummerrisk-mysql-password
   namespace: {{ .Release.Namespace | quote }}
+  annotations:
+    "helm.sh/hook": pre-install
   labels:
     app.kubernetes.io/name: mysql
 type: Opaque
diff --git a/charts/hummerrisk/templates/redis/redis-config.yaml b/charts/hummerrisk/templates/redis/redis-config.yaml
index 981f472..ff5b731 100644
--- a/charts/hummerrisk/templates/redis/redis-config.yaml
+++ b/charts/hummerrisk/templates/redis/redis-config.yaml
@@ -5,6 +5,8 @@ kind: ConfigMap
 metadata:
   name: hummerrisk-redis-config
   namespace: {{ .Release.Namespace | quote }}
+  annotations:
+    "helm.sh/hook": pre-install
   labels:
     app.kubernetes.io/name: mysql
 data:
diff --git a/charts/hummerrisk/templates/redis/redis-deploy.yaml b/charts/hummerrisk/templates/redis/redis-deploy.yaml
index eda10f6..ceac615 100644
--- a/charts/hummerrisk/templates/redis/redis-deploy.yaml
+++ b/charts/hummerrisk/templates/redis/redis-deploy.yaml
@@ -6,6 +6,8 @@ kind: Service
 metadata:
   name: {{ $fullName }}-redis
   namespace: {{ .Release.Namespace | quote }}
+  annotations:
+    "helm.sh/hook": pre-install
   labels:
     app.kubernetes.io/name: redis
 spec:
diff --git a/charts/hummerrisk/templates/redis/redis-pvc.yaml b/charts/hummerrisk/templates/redis/redis-pvc.yaml
index 480ec17..1ab90ee 100644
--- a/charts/hummerrisk/templates/redis/redis-pvc.yaml
+++ b/charts/hummerrisk/templates/redis/redis-pvc.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   annotations:
     volume.beta.kubernetes.io/storage-class: {{ .Values.global.storageClass |quote }}
+    "helm.sh/hook": pre-install
 spec:
   storageClassName: {{ .Values.global.storageClass |quote }}
   accessModes:
diff --git a/charts/hummerrisk/templates/redis/redis-secret.yaml b/charts/hummerrisk/templates/redis/redis-secret.yaml
index bcc29aa..4d47e8f 100644
--- a/charts/hummerrisk/templates/redis/redis-secret.yaml
+++ b/charts/hummerrisk/templates/redis/redis-secret.yaml
@@ -6,6 +6,8 @@ kind: Secret
 metadata:
   name: hummerrisk-redis-password
   namespace: {{ .Release.Namespace | quote }}
+  annotations:
+    "helm.sh/hook": pre-install
   labels:
     app.kubernetes.io/name: redis
 type: Opaque
diff --git a/charts/hummerrisk/templates/web/deployment-ui.yaml b/charts/hummerrisk/templates/web/deployment-ui.yaml
index d27ad7a..2b11752 100644
--- a/charts/hummerrisk/templates/web/deployment-ui.yaml
+++ b/charts/hummerrisk/templates/web/deployment-ui.yaml
@@ -50,15 +50,10 @@ spec:
         volumeMounts:
           - name: config-volume
             mountPath: /etc/nginx/conf.d/
-          - name: log-volume
-            mountPath: /var/log/nginx/
         ports:
           - containerPort: 80
       volumes:
         - name: config-volume
           configMap:
             defaultMode: 420
-            name: hummerrisk-web-config
-        - name: log-volume
-          persistentVolumeClaim:
-            claimName: {{ $pvcFullName }}-logs
\ No newline at end of file
+            name: hummerrisk-web-config
\ No newline at end of file