diff --git a/.github/workflows/infrastructure.yaml b/.github/workflows/infrastructure.yaml
index 096baea..fb0c53a 100644
--- a/.github/workflows/infrastructure.yaml
+++ b/.github/workflows/infrastructure.yaml
@@ -1,9 +1,6 @@
 name: Validate Infrastructure
 
 on:
-  push:
-    branches:
-      - main
   pull_request:
   merge_group:
 
diff --git a/gitops-settings/warehouse.yaml b/gitops-settings/warehouse.yaml
index ddd65c8..dca366e 100644
--- a/gitops-settings/warehouse.yaml
+++ b/gitops-settings/warehouse.yaml
@@ -25,4 +25,4 @@ spec:
         strictSemvers: false
   freightCreationPolicy: Automatic
   freightCreationCriteria:
-    expression: imageFrom('ghcr.io/procinger/gitops-demo-frontend/frontend').Tag == commitFrom('https://github.com/procinger/gitops-demo-frontend.git').Tag
+    expression: imageFrom('ghcr.io/procinger/gitops-demo-frontend/backend').Tag == imageFrom('ghcr.io/procinger/gitops-demo-frontend/frontend').Tag == commitFrom('https://github.com/procinger/gitops-demo-frontend.git').Tag