diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..69f039aada
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.vscode/
+.idea/
+pipeline-bundle-list
+task-bundle-list
diff --git a/.tekton/tasks/e2e-test.yaml b/.tekton/tasks/e2e-test.yaml
index 04de907609..c514c7a3dd 100644
--- a/.tekton/tasks/e2e-test.yaml
+++ b/.tekton/tasks/e2e-test.yaml
@@ -18,12 +18,13 @@ spec:
       type: string
   steps:
     - name: e2e-test
-      image: quay.io/redhat-appstudio/e2e-tests:13ba743f0ae3fe85502a598ea2a9d7da91164b61
+      image: quay.io/redhat-appstudio/e2e-tests:b5c5f1cf9bf9f641859aadb8f80eded96c70785c
       # a la infra-deployment updates, when PRs merge in e2e-tests, PRs will be opened
       # against build-definitions to update this tag
       args: [
         "--ginkgo.label-filter=build-templates-e2e",
-        "--ginkgo.no-color"
+        "--ginkgo.no-color",
+        "--ginkgo.timeout=2h"
       ]
       securityContext:
         runAsUser: 1000
@@ -31,7 +32,7 @@ spec:
       - name: APP_SUFFIX
         value: "$(params.app_suffix)"
       - name: COMPONENT_REPO_URLS
-        value: "https://github.com/redhat-appstudio-qe/devfile-sample-python-basic,https://github.com/redhat-appstudio-qe/retrodep,https://github.com/cachito-testing/pip-e2e-test,https://github.com/redhat-appstudio-qe/fbc-sample-repo,https://github.com/redhat-appstudio-qe/nodejs-no-dockerfile,https://github.com/redhat-appstudio-qe/maven-hello-world,https://github.com/redhat-appstudio-qe/e2e-tests-parent-image-with-both-tag-digest,https://github.com/redhat-appstudio-qe/e2e-tests-parent-image-with-digest-only,https://github.com/redhat-appstudio-qe/e2e-tests-use-latest-parent-image,https://github.com/redhat-appstudio-qe/e2e-tests-parent-image-from-registry-rh-io"
+        value: "https://github.com/redhat-appstudio-qe/devfile-sample-python-basic,https://github.com/redhat-appstudio-qe/retrodep,https://github.com/cachito-testing/pip-e2e-test,https://github.com/redhat-appstudio-qe/fbc-sample-repo,https://github.com/redhat-appstudio-qe/nodejs-no-dockerfile,https://github.com/redhat-appstudio-qe/maven-hello-world,https://github.com/redhat-appstudio-qe/source-build-parent-image-with-digest-only,https://github.com/redhat-appstudio-qe/source-build-parent-image-with-both-tag-digest,https://github.com/redhat-appstudio-qe/source-build-use-latest-parent-image,https://github.com/redhat-appstudio-qe/source-build-parent-image-from-registry-rh-io"
       - name: QUAY_E2E_ORGANIZATION
         value: redhat-appstudio
       - name: E2E_APPLICATIONS_NAMESPACE
diff --git a/pipelines/docker-build-rhtap/patch.yaml b/pipelines/docker-build-rhtap/patch.yaml
index 362e7c7b5b..36e7df74fc 100644
--- a/pipelines/docker-build-rhtap/patch.yaml
+++ b/pipelines/docker-build-rhtap/patch.yaml
@@ -14,6 +14,13 @@
     name: stackrox-secret
     type: string
     default: "rox-api-token"
+- op: add
+  path: /spec/params/-
+  value:
+    name: gitops-auth-secret-name
+    type: string
+    default: gitops-auth-secret
+    description: "Secret name to enable this pipeline to update the gitops repo with the new image. "
 - op: add
   path: /spec/params/-
   value:
@@ -141,6 +148,8 @@
         value: $(params.git-url)-gitops
       - name: image
         value: $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
+      - name: gitops-auth-secret-name
+        value: $(params.gitops-auth-secret-name)
     runAfter:
       - build-container
     when:
diff --git a/pipelines/fbc-builder/patch.yaml b/pipelines/fbc-builder/patch.yaml
index 8a131d3fb1..9f139a8ce4 100644
--- a/pipelines/fbc-builder/patch.yaml
+++ b/pipelines/fbc-builder/patch.yaml
@@ -28,6 +28,35 @@
     value: "$(params.image-expires-after)"
   - name: COMMIT_SHA
     value: "$(tasks.clone-repository.results.commit)"
+# Remove tasks
+# Example - yq .spec.tasks.[].name ../build-definitions/pipelines/template-build/template-build.yaml | nl -v 0
+# to compute offsets
+#      0  init
+#      1  clone-repository
+#      2  prefetch-dependencies
+#      3  build-container
+#      4  build-source-image
+#      5  deprecated-base-image-check
+#      6  clair-scan
+#      7  ecosystem-cert-preflight-checks
+#      8  sast-snyk-check
+#      9  clamav-scan
+#      10 sbom-json-check
+- op: replace
+  path: /spec/tasks/3/runAfter/0
+  value: clone-repository
+- op: remove
+  path: /spec/tasks/9  # clamav-scan
+- op: remove
+  path: /spec/tasks/8  # sast-snyk-check
+- op: remove
+  path: /spec/tasks/7  # ecosystem-cert-preflight-checks
+- op: remove
+  path: /spec/tasks/6  # clair-scan
+- op: remove
+  path: /spec/tasks/4  # build-source-image
+- op: remove
+  path: /spec/tasks/2  # prefetch-dependencies
 - op: add
   path: /spec/tasks/-
   value:
@@ -88,6 +117,3 @@
     workspaces:
       - name: workspace
         workspace: workspace
-# - op: remove
-#   # build-source-image as source images are not needed for FBC components
-#   path: /spec/tasks/4