diff --git a/test/e2e/e2e-template.yml b/test/e2e/e2e-template.yml
index 6d3c4ce..8b9cc15 100644
--- a/test/e2e/e2e-template.yml
+++ b/test/e2e/e2e-template.yml
@@ -1,4 +1,5 @@
 # THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT.
+# Temporarily add S3 upload capability to the osde2e template for testing
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
@@ -42,6 +43,14 @@ parameters:
     required: false
   - name: SLACK_NOTIFY
     required: false
+  - name: S3_RESULTS_BUCKET
+    value: 'osde2e-loki-logs'
+  - name: S3_RESULTS_REGION
+    value: 'us-east-1'
+  - name: ENABLE_S3_UPLOAD
+    value: 'true'
+  - name: OPERATOR_NAME
+    value: 'osd-example-operator'
 objects:
   - apiVersion: batch/v1
     kind: Job
@@ -52,19 +61,21 @@ objects:
       template:
         spec:
           restartPolicy: Never
+          volumes:
+            - name: test-results
+              emptyDir: {}
           containers:
             - name: osde2e
               image: quay.io/redhat-services-prod/osde2e-cicada-tenant/osde2e:latest
               command:
-                - /osde2e
-              args:
-                - test
-                - --only-health-check-nodes
-                - --skip-destroy-cluster
-                - --skip-must-gather
-                - --log-analysis-enable
-                - --configs
-                - ${OSDE2E_CONFIGS}
+                - /bin/sh
+                - -c
+                - |
+                  /osde2e test --only-health-check-nodes --skip-destroy-cluster --skip-must-gather --log-analysis-enable --configs ${OSDE2E_CONFIGS}
+                  TEST_EXIT_CODE=$?
+                  cp -r /test-run-results/* /shared-results/ 2>/dev/null || true
+                  echo "$TEST_EXIT_CODE" > /shared-results/.test-complete
+                  exit $TEST_EXIT_CODE
               securityContext:
                 runAsNonRoot: true
                 allowPrivilegeEscalation: false
@@ -124,3 +135,49 @@ objects:
                       key: cad-pagerduty-routing-key
                 - name: SLACK_NOTIFY
                   value: ${SLACK_NOTIFY}
+              volumeMounts:
+                - name: test-results
+                  mountPath: /shared-results
+            - name: s3-uploader
+              image: quay.io/app-sre/aws-cli
+              command:
+                - /bin/sh
+                - -c
+                - |
+                  while [ ! -f /shared-results/.test-complete ]; do sleep 10; done
+                  if [ "${ENABLE_S3_UPLOAD}" != "true" ]; then exit 0; fi
+                  DATE=$(date -u +%Y-%m-%d)
+                  S3_PREFIX="test-results/${OPERATOR_NAME}/${DATE}/${IMAGE_TAG}-${JOBID}"
+                  aws s3 sync /shared-results/ "s3://${S3_RESULTS_BUCKET}/${S3_PREFIX}/" --exclude ".test-complete" --no-progress
+                  echo "Uploaded to s3://${S3_RESULTS_BUCKET}/${S3_PREFIX}/"
+              securityContext:
+                runAsNonRoot: true
+                allowPrivilegeEscalation: false
+                capabilities:
+                  drop: ["ALL"]
+                seccompProfile:
+                  type: RuntimeDefault
+              env:
+                - name: AWS_ACCESS_KEY_ID
+                  valueFrom:
+                    secretKeyRef:
+                      name: osde2e-aws-credentials
+                      key: aws-access-key-id
+                - name: AWS_SECRET_ACCESS_KEY
+                  valueFrom:
+                    secretKeyRef:
+                      name: osde2e-aws-credentials
+                      key: aws-secret-access-key
+                - name: AWS_DEFAULT_REGION
+                  value: ${S3_RESULTS_REGION}
+                - name: S3_RESULTS_BUCKET
+                  value: ${S3_RESULTS_BUCKET}
+                - name: OPERATOR_NAME
+                  value: ${OPERATOR_NAME}
+                - name: IMAGE_TAG
+                  value: ${IMAGE_TAG}
+                - name: ENABLE_S3_UPLOAD
+                  value: ${ENABLE_S3_UPLOAD}
+              volumeMounts:
+                - name: test-results
+                  mountPath: /shared-results