diff --git a/aws/my-recipes-chart-aws/templates/db-migration-job.yaml b/aws/my-recipes-chart-aws/templates/db-migration-job.yaml
index f153342..3cf1dbe 100644
--- a/aws/my-recipes-chart-aws/templates/db-migration-job.yaml
+++ b/aws/my-recipes-chart-aws/templates/db-migration-job.yaml
@@ -30,7 +30,9 @@ spec:
                 echo "Database not ready, waiting..."
                 sleep 2
               done
-              echo "Database is ready, running migration..."
+              echo "Database is ready, applying schema..."
+              PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -f /schema/schema.sql
+              echo "Schema applied, running migrations..."
               PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -f /migration/migrate.sql
               echo "Migration completed successfully"
           env:
@@ -62,8 +64,12 @@ spec:
           volumeMounts:
             - name: migration-script
               mountPath: /migration
+            - name: schema-script
+              mountPath: /schema
       volumes:
         - name: migration-script
           configMap:
             name: {{ .Release.Name }}-db-migration
-
+        - name: schema-script
+          configMap:
+            name: {{ .Release.Name }}-db-schema
diff --git a/aws/my-recipes-chart-aws/templates/ingress.yaml b/aws/my-recipes-chart-aws/templates/ingress.yaml
index d106c59..af6f83e 100644
--- a/aws/my-recipes-chart-aws/templates/ingress.yaml
+++ b/aws/my-recipes-chart-aws/templates/ingress.yaml
@@ -2,11 +2,10 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ .Release.Name }}-frontend
+  name: {{ .Release.Name }}
   namespace: {{ .Values.global.namespace }}
   labels:
-    app: {{ .Release.Name }}-frontend
-    component: frontend
+    app: {{ .Release.Name }}
   {{- with .Values.frontend.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -16,6 +15,7 @@ spec:
   ingressClassName: {{ .Values.frontend.ingress.className }}
   {{- end }}
   rules:
+    # Frontend rule
     {{- range .Values.frontend.ingress.hosts }}
     - host: {{ .host | quote }}
       http:
@@ -30,38 +30,7 @@ spec:
                   number: {{ $.Values.frontend.service.port }}
           {{- end }}
     {{- end }}
-  {{- if .Values.frontend.ingress.tls }}
-  tls:
-    {{- range .Values.frontend.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-{{- end }}
-
----
-
-{{- if .Values.backend.ingress.enabled }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ .Release.Name }}-backend
-  namespace: {{ .Values.global.namespace }}
-  labels:
-    app: {{ .Release.Name }}-backend
-    component: backend
-  {{- with .Values.backend.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.backend.ingress.className }}
-  ingressClassName: {{ .Values.backend.ingress.className }}
-  {{- end }}
-  rules:
+    # Backend API rule
     {{- range .Values.backend.ingress.hosts }}
     - host: {{ .host | quote }}
       http:
@@ -76,14 +45,4 @@ spec:
                   number: {{ $.Values.backend.service.port }}
           {{- end }}
     {{- end }}
-  {{- if .Values.backend.ingress.tls }}
-  tls:
-    {{- range .Values.backend.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
 {{- end }}