diff --git a/ci-operator/config/openshift/faas-console-plugin/openshift-faas-console-plugin-master.yaml b/ci-operator/config/openshift/faas-console-plugin/openshift-faas-console-plugin-master.yaml
index faa53a667fd6d..12cf28eedea99 100644
--- a/ci-operator/config/openshift/faas-console-plugin/openshift-faas-console-plugin-master.yaml
+++ b/ci-operator/config/openshift/faas-console-plugin/openshift-faas-console-plugin-master.yaml
@@ -1,8 +1,6 @@
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: tectonic-console-builder-v29
+  project_image:
+    dockerfile_path: Dockerfile.buildroot
 images:
   items:
   - dockerfile_path: Dockerfile
@@ -22,29 +20,45 @@ resources:
     limits:
       memory: 6Gi
     requests:
-      cpu: 1000m
-      memory: 6Gi
+      cpu: "1"
+      memory: 3Gi
+test_binary_build_commands: yarn install --immutable && npx playwright install chromium
 tests:
 - as: lint
-  steps:
-    test:
-    - as: lint
-      commands: yarn install && yarn run lint && yarn run build
-      from: src
-      resources:
-        requests:
-          cpu: 200m
-          memory: 300Mi
+  commands: make lint
+  container:
+    from: test-bin
+  skip_if_only_changed: \.md$|^docs/|^demo/|^\.claude/|^\.github/|^\.vscode/|^\.husky/|^hack/|^\.tekton/|^(LICENSE|OWNERS)$
 - as: unit
+  commands: make unit
+  container:
+    from: test-bin
+  skip_if_only_changed: \.md$|^docs/|^demo/|^\.claude/|^\.github/|^\.vscode/|^\.husky/|^hack/|^\.tekton/|^(LICENSE|OWNERS)$
+- as: e2e-aws
+  pipeline_skip_if_only_changed: \.md$|^docs/|^demo/|^\.claude/|^\.github/|^\.vscode/|^\.husky/|^hack/|^\.tekton/|^(LICENSE|OWNERS)$
   steps:
+    cluster_profile: openshift-org-aws
+    env:
+      OPERATORS: |
+        [
+          {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "operator_group": "openshift-serverless"},
+          {"name": "openshift-pipelines-operator-rh", "source": "redhat-operators", "channel": "latest", "install_namespace": "openshift-operators"}
+        ]
     test:
-    - as: unit
-      commands: yarn install && yarn run test
-      from: src
+    - ref: install-operators
+    - as: e2e
+      cli: latest
+      commands: make e2e
+      dependencies:
+      - env: PLUGIN_PULL_SPEC
+        name: faas-console-plugin
+      from: test-bin
+      grace_period: 30m0s
       resources:
         requests:
-          cpu: 200m
-          memory: 300Mi
+          cpu: 500m
+      timeout: 3h0m0s
+    workflow: openshift-e2e-aws
 zz_generated_metadata:
   branch: master
   org: openshift
diff --git a/ci-operator/jobs/openshift/faas-console-plugin/openshift-faas-console-plugin-master-presubmits.yaml b/ci-operator/jobs/openshift/faas-console-plugin/openshift-faas-console-plugin-master-presubmits.yaml
index 553420663265a..ea2ecb5e9a68d 100644
--- a/ci-operator/jobs/openshift/faas-console-plugin/openshift-faas-console-plugin-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/faas-console-plugin/openshift-faas-console-plugin-master-presubmits.yaml
@@ -1,5 +1,90 @@
 presubmits:
   openshift/faas-console-plugin:
+  - agent: kubernetes
+    always_run: false
+    annotations:
+      pipeline_skip_if_only_changed: \.md$|^docs/|^demo/|^\.claude/|^\.github/|^\.vscode/|^\.husky/|^hack/|^\.tekton/|^(LICENSE|OWNERS)$
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build07
+    context: ci/prow/e2e-aws
+    decorate: true
+    decoration_config:
+      sparse_checkout_files:
+      - Dockerfile
+    labels:
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-faas-console-plugin-master-e2e-aws
+    rerun_command: /test e2e-aws
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --target=e2e-aws
+        command:
+        - ci-operator
+        env:
+        - name: HTTP_SERVER_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
+        imagePullPolicy: Always
+        name: ""
+        ports:
+        - containerPort: 8080
+          name: http
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -57,7 +142,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -72,14 +157,13 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-faas-console-plugin-master-lint
     rerun_command: /test lint
+    skip_if_only_changed: \.md$|^docs/|^demo/|^\.claude/|^\.github/|^\.vscode/|^\.husky/|^hack/|^\.tekton/|^(LICENSE|OWNERS)$
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
         - --target=lint
         command:
         - ci-operator
@@ -98,12 +182,6 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -118,15 +196,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: credentials
-            path: credentials
-          secretName: boskos-credentials
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
       - name: manifest-tool-local-pusher
         secret:
           secretName: manifest-tool-local-pusher
@@ -138,7 +207,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )lint,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -153,14 +222,13 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-faas-console-plugin-master-unit
     rerun_command: /test unit
+    skip_if_only_changed: \.md$|^docs/|^demo/|^\.claude/|^\.github/|^\.vscode/|^\.husky/|^hack/|^\.tekton/|^(LICENSE|OWNERS)$
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
         - --target=unit
         command:
         - ci-operator
@@ -179,12 +247,6 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -199,15 +261,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: credentials
-            path: credentials
-          secretName: boskos-credentials
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
       - name: manifest-tool-local-pusher
         secret:
           secretName: manifest-tool-local-pusher