diff --git a/test/e2e/app_management_test.go b/test/e2e/app_management_test.go
index b511d168cea34..deea0d76dbf68 100644
--- a/test/e2e/app_management_test.go
+++ b/test/e2e/app_management_test.go
@@ -948,7 +948,7 @@ func TestLocalManifestSync(t *testing.T) {
 		And(func(app *Application) {
 			res, _ := RunCli("app", "manifests", app.Name)
 			assert.Contains(t, res, "containerPort: 80")
-			assert.Contains(t, res, "image: gcr.io/heptio-images/ks-guestbook-demo:0.2")
+			assert.Contains(t, res, "image: quay.io/argoprojlabs/argocd-e2e-container:0.2")
 		}).
 		Given().
 		LocalPath(guestbookPathLocal).
@@ -959,7 +959,7 @@ func TestLocalManifestSync(t *testing.T) {
 		And(func(app *Application) {
 			res, _ := RunCli("app", "manifests", app.Name)
 			assert.Contains(t, res, "containerPort: 81")
-			assert.Contains(t, res, "image: gcr.io/heptio-images/ks-guestbook-demo:0.3")
+			assert.Contains(t, res, "image: quay.io/argoprojlabs/argocd-e2e-container:0.3")
 		}).
 		Given().
 		LocalPath("").
@@ -970,7 +970,7 @@ func TestLocalManifestSync(t *testing.T) {
 		And(func(app *Application) {
 			res, _ := RunCli("app", "manifests", app.Name)
 			assert.Contains(t, res, "containerPort: 80")
-			assert.Contains(t, res, "image: gcr.io/heptio-images/ks-guestbook-demo:0.2")
+			assert.Contains(t, res, "image: quay.io/argoprojlabs/argocd-e2e-container:0.2")
 		})
 }
 
@@ -1191,7 +1191,8 @@ func TestPermissionWithScopedRepo(t *testing.T) {
 		Name(projName).
 		Destination("*,*").
 		When().
-		Create()
+		Create().
+		AddSource("*")
 
 	repoFixture.Given(t, true).
 		When().
diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go
index 9849cb7e0b1a1..feb295d9c09be 100644
--- a/test/e2e/diff_test.go
+++ b/test/e2e/diff_test.go
@@ -22,7 +22,7 @@ metadata:
 spec:
   containers:
     - name: main
-      image: alpine:3.10.2
+      image: quay.io/argoprojlabs/argocd-e2e-container:0.1
       imagePullPolicy: IfNotPresent
       command:
         - "true"
@@ -43,7 +43,7 @@ metadata:
 spec:
   containers:
     - name: main
-      image: alpine:3.10.2
+      image: quay.io/argoprojlabs/argocd-e2e-container:0.1
       imagePullPolicy: IfNotPresent
       command:
         - "true"
diff --git a/test/e2e/fixture/project/context.go b/test/e2e/fixture/project/context.go
index 360e81155d500..95f3749c7bfe3 100644
--- a/test/e2e/fixture/project/context.go
+++ b/test/e2e/fixture/project/context.go
@@ -15,6 +15,7 @@ type Context struct {
 	timeout     int
 	name        string
 	destination string
+	repos       []string
 }
 
 func Given(t *testing.T) *Context {
@@ -43,6 +44,11 @@ func (c *Context) Destination(destination string) *Context {
 	return c
 }
 
+func (c *Context) SourceRepositories(repos []string) *Context {
+	c.repos = repos
+	return c
+}
+
 func (c *Context) And(block func()) *Context {
 	block()
 	return c
diff --git a/test/e2e/hook_test.go b/test/e2e/hook_test.go
index 9623b85ba6561..f6bb1be872ac6 100644
--- a/test/e2e/hook_test.go
+++ b/test/e2e/hook_test.go
@@ -171,7 +171,7 @@ spec:
   containers:
     - command:
         - "true"
-      image: "alpine:latest"
+      image: "quay.io/argoprojlabs/argocd-e2e-container:0.1"
       imagePullPolicy: IfNotPresent
       name: main
   restartPolicy: Never
@@ -202,7 +202,7 @@ spec:
   containers:
     - command:
         - "true"
-      image: "alpine:latest"
+      image: "quay.io/argoprojlabs/argocd-e2e-container:0.1"
       imagePullPolicy: IfNotPresent
       name: main
   restartPolicy: Never
@@ -218,7 +218,7 @@ spec:
   containers:
     - command:
         - "false"
-      image: "alpine:latest"
+      image: "quay.io/argoprojlabs/argocd-e2e-container:0.1"
       imagePullPolicy: IfNotPresent
       name: main
   restartPolicy: Never
diff --git a/test/e2e/multiarch-container/Dockerfile b/test/e2e/multiarch-container/Dockerfile
new file mode 100644
index 0000000000000..41667d28f8176
--- /dev/null
+++ b/test/e2e/multiarch-container/Dockerfile
@@ -0,0 +1,2 @@
+FROM docker.io/library/busybox
+CMD exec sh -c "trap : TERM INT; echo 'Hi' && tail -f /dev/null"
diff --git a/test/e2e/multiarch-container/build.sh b/test/e2e/multiarch-container/build.sh
new file mode 100755
index 0000000000000..350f6e30d548f
--- /dev/null
+++ b/test/e2e/multiarch-container/build.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -x
+VERSIONS="0.1 0.2 0.3"
+PLATFORMS="linux/amd64,linux/arm64,linux/s390x,linux/ppc64le"
+for version in $VERSIONS; do
+	docker buildx build \
+		-t "quay.io/argoprojlabs/argocd-e2e-container:${version}" \
+		--platform "${PLATFORMS}" \
+		--push \
+		.
+done
diff --git a/test/e2e/testdata/cluster-role/pod.yaml b/test/e2e/testdata/cluster-role/pod.yaml
index cb488d7feba96..efc927693e07c 100644
--- a/test/e2e/testdata/cluster-role/pod.yaml
+++ b/test/e2e/testdata/cluster-role/pod.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
     - name: main
-      image: alpine:3.10.2
+      image: quay.io/argoprojlabs/argocd-e2e-container:0.1
       imagePullPolicy: IfNotPresent
       command:
         - "true"
diff --git a/test/e2e/testdata/crd-validation/deployment.yaml b/test/e2e/testdata/crd-validation/deployment.yaml
index 2b9fcaf354bea..92890c1a90986 100644
--- a/test/e2e/testdata/crd-validation/deployment.yaml
+++ b/test/e2e/testdata/crd-validation/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: nginx
-          image: nginx:1.17.4-alpine
+          image: quay.io/argoprojlabs/argocd-e2e-container:0.1
           ports:
             - containerPort: "80"
           imagePullPolicy: IfNotPresent
\ No newline at end of file
diff --git a/test/e2e/testdata/deployment/deployment.yaml b/test/e2e/testdata/deployment/deployment.yaml
index d84ca5e1f785f..92e22a2ba9841 100644
--- a/test/e2e/testdata/deployment/deployment.yaml
+++ b/test/e2e/testdata/deployment/deployment.yaml
@@ -16,6 +16,6 @@ spec:
     spec:
       containers:
         - name: nginx
-          image: nginx:1.17.4-alpine
+          image: quay.io/argoprojlabs/argocd-e2e-container:0.1
           ports:
             - containerPort: 80
diff --git a/test/e2e/testdata/deprecated-extensions/deployment.yaml b/test/e2e/testdata/deprecated-extensions/deployment.yaml
index b82457347dadf..5593c3157fc57 100644
--- a/test/e2e/testdata/deprecated-extensions/deployment.yaml
+++ b/test/e2e/testdata/deprecated-extensions/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: extensions-deployment
-          image: "gcr.io/heptio-images/ks-guestbook-demo:0.2"
+          image: quay.io/argoprojlabs/argocd-e2e-container:0.1
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
diff --git a/test/e2e/testdata/git-submodule/submodule-pod.yaml b/test/e2e/testdata/git-submodule/submodule-pod.yaml
index 1f43fe9dd9f9e..fa3b92c2f5875 100644
--- a/test/e2e/testdata/git-submodule/submodule-pod.yaml
+++ b/test/e2e/testdata/git-submodule/submodule-pod.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
     - name: main
-      image: alpine:3.10.2
+      image: quay.io/argoprojlabs/argocd-e2e-container:0.1
       imagePullPolicy: IfNotPresent
       command:
         - "true"
diff --git a/test/e2e/testdata/guestbook-logs/guestbook-ui-deployment.yaml b/test/e2e/testdata/guestbook-logs/guestbook-ui-deployment.yaml
index fe1f59e312acb..592d552fa70a4 100644
--- a/test/e2e/testdata/guestbook-logs/guestbook-ui-deployment.yaml
+++ b/test/e2e/testdata/guestbook-logs/guestbook-ui-deployment.yaml
@@ -14,13 +14,8 @@ spec:
         app: guestbook-ui
     spec:
       containers:
-      - image: busybox
+      - image: quay.io/argoprojlabs/argocd-e2e-container:0.1
         imagePullPolicy: IfNotPresent
         name: guestbook-ui
-        command:
-          - sh
-        args:
-           - -c
-           - "echo \"Hi\" && tail -f /dev/null"
         ports:
         - containerPort: 80
diff --git a/test/e2e/testdata/guestbook-with-namespace/guestbook-ui-deployment-ns.yaml b/test/e2e/testdata/guestbook-with-namespace/guestbook-ui-deployment-ns.yaml
index 08751d3cc8d24..dba58068db39c 100644
--- a/test/e2e/testdata/guestbook-with-namespace/guestbook-ui-deployment-ns.yaml
+++ b/test/e2e/testdata/guestbook-with-namespace/guestbook-ui-deployment-ns.yaml
@@ -15,7 +15,7 @@ spec:
         app: guestbook-ui
     spec:
       containers:
-      - image: gcr.io/heptio-images/ks-guestbook-demo:0.2
+      - image: quay.io/argoprojlabs/argocd-e2e-container:0.1
         imagePullPolicy: IfNotPresent
         name: guestbook-ui
         ports:
diff --git a/test/e2e/testdata/guestbook-with-namespace/guestbook-ui-deployment.yaml b/test/e2e/testdata/guestbook-with-namespace/guestbook-ui-deployment.yaml
index 434505e7462d0..039508bab8e24 100644
--- a/test/e2e/testdata/guestbook-with-namespace/guestbook-ui-deployment.yaml
+++ b/test/e2e/testdata/guestbook-with-namespace/guestbook-ui-deployment.yaml
@@ -14,7 +14,7 @@ spec:
         app: guestbook-ui
     spec:
       containers:
-      - image: gcr.io/heptio-images/ks-guestbook-demo:0.2
+      - image: quay.io/argoprojlabs/argocd-e2e-container:0.2
         imagePullPolicy: IfNotPresent
         name: guestbook-ui
         ports:
diff --git a/test/e2e/testdata/guestbook/guestbook-ui-deployment.yaml b/test/e2e/testdata/guestbook/guestbook-ui-deployment.yaml
index 434505e7462d0..039508bab8e24 100644
--- a/test/e2e/testdata/guestbook/guestbook-ui-deployment.yaml
+++ b/test/e2e/testdata/guestbook/guestbook-ui-deployment.yaml
@@ -14,7 +14,7 @@ spec:
         app: guestbook-ui
     spec:
       containers:
-      - image: gcr.io/heptio-images/ks-guestbook-demo:0.2
+      - image: quay.io/argoprojlabs/argocd-e2e-container:0.2
         imagePullPolicy: IfNotPresent
         name: guestbook-ui
         ports:
diff --git a/test/e2e/testdata/guestbook_local/guestbook-ui-deployment.yaml b/test/e2e/testdata/guestbook_local/guestbook-ui-deployment.yaml
index 27a269561d602..d3c08e97c911e 100644
--- a/test/e2e/testdata/guestbook_local/guestbook-ui-deployment.yaml
+++ b/test/e2e/testdata/guestbook_local/guestbook-ui-deployment.yaml
@@ -14,7 +14,7 @@ spec:
         app: guestbook-ui
     spec:
       containers:
-      - image: gcr.io/heptio-images/ks-guestbook-demo:0.3
+      - image: quay.io/argoprojlabs/argocd-e2e-container:0.3
         name: guestbook-ui
         ports:
         - containerPort: 81
diff --git a/test/e2e/testdata/hook-and-deployment/deployment.yaml b/test/e2e/testdata/hook-and-deployment/deployment.yaml
index d10b14eb6398f..d16a3a6b4d3ba 100644
--- a/test/e2e/testdata/hook-and-deployment/deployment.yaml
+++ b/test/e2e/testdata/hook-and-deployment/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: main
-        image: nginx:1.17.4-alpine
+        image: quay.io/argoprojlabs/argocd-e2e-container:0.1
         imagePullPolicy: IfNotPresent
         readinessProbe:
           failureThreshold: 3
diff --git a/test/e2e/testdata/hook-and-deployment/hook.yaml b/test/e2e/testdata/hook-and-deployment/hook.yaml
index a852381d27a50..86af9d881b0a7 100644
--- a/test/e2e/testdata/hook-and-deployment/hook.yaml
+++ b/test/e2e/testdata/hook-and-deployment/hook.yaml
@@ -10,7 +10,7 @@ spec:
       containers:
         - command:
             - "true"
-          image: "alpine:3.10.2"
+          image: quay.io/argoprojlabs/argocd-e2e-container:0.1
           imagePullPolicy: IfNotPresent
           name: main
       restartPolicy: Never
\ No newline at end of file
diff --git a/test/e2e/testdata/hook/hook.yaml b/test/e2e/testdata/hook/hook.yaml
index c14b9d24d9adb..ca89c3d6d5bb6 100644
--- a/test/e2e/testdata/hook/hook.yaml
+++ b/test/e2e/testdata/hook/hook.yaml
@@ -8,7 +8,7 @@ spec:
   containers:
     - command:
         - "true"
-      image: "alpine:latest"
+      image: quay.io/argoprojlabs/argocd-e2e-container:0.1
       imagePullPolicy: IfNotPresent
       name: main
   restartPolicy: Never
\ No newline at end of file
diff --git a/test/e2e/testdata/hook/pod.yaml b/test/e2e/testdata/hook/pod.yaml
index 938a0ff19ac2b..001aa52b04cec 100644
--- a/test/e2e/testdata/hook/pod.yaml
+++ b/test/e2e/testdata/hook/pod.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
     - name: main
-      image: alpine:latest
+      image: quay.io/argoprojlabs/argocd-e2e-container:0.1
       imagePullPolicy: IfNotPresent
       command:
         - "true"
diff --git a/test/e2e/testdata/kustomize/pod.yaml b/test/e2e/testdata/kustomize/pod.yaml
index fa4d920c8b8d4..7b701b46448a6 100644
--- a/test/e2e/testdata/kustomize/pod.yaml
+++ b/test/e2e/testdata/kustomize/pod.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
     - name: main
-      image: alpine:3.10.2
+      image: quay.io/argoprojlabs/argocd-e2e-container:0.1
       imagePullPolicy: IfNotPresent
       command:
         - "true"
diff --git a/test/e2e/testdata/multi-namespace-hook/multi-namespace-hook.yaml b/test/e2e/testdata/multi-namespace-hook/multi-namespace-hook.yaml
index 90979745ff5c9..2a4cb9f5a60f2 100644
--- a/test/e2e/testdata/multi-namespace-hook/multi-namespace-hook.yaml
+++ b/test/e2e/testdata/multi-namespace-hook/multi-namespace-hook.yaml
@@ -22,7 +22,7 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: nginx:1.17.4-alpine
+        image: quay.io/argoprojlabs/argocd-e2e-container:0.1
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80
@@ -39,7 +39,7 @@ spec:
   restartPolicy: Never
   containers:
   - name: main
-    image: alpine:3.10.2
+    image: quay.io/argoprojlabs/argocd-e2e-container:0.1
     imagePullPolicy: IfNotPresent
     command: [sh, -c, "sleep 10"]
 
@@ -56,6 +56,6 @@ spec:
   restartPolicy: Never
   containers:
   - name: main
-    image: alpine:3.10.2
+    image: quay.io/argoprojlabs/argocd-e2e-container:0.1
     imagePullPolicy: IfNotPresent
     command: [sh, -c, "sleep 10"]
diff --git a/test/e2e/testdata/multi-namespace/deployment-with-namespace.yaml b/test/e2e/testdata/multi-namespace/deployment-with-namespace.yaml
index 9b5023622e806..474e117ac487c 100644
--- a/test/e2e/testdata/multi-namespace/deployment-with-namespace.yaml
+++ b/test/e2e/testdata/multi-namespace/deployment-with-namespace.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: helm-guestbook
-          image: "gcr.io/heptio-images/ks-guestbook-demo:0.2"
+          image: quay.io/argoprojlabs/argocd-e2e-container:0.2
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -30,4 +30,4 @@ spec:
           readinessProbe:
             httpGet:
               path: /
-              port: http
\ No newline at end of file
+              port: http
diff --git a/test/e2e/testdata/multi-namespace/deployment.yaml b/test/e2e/testdata/multi-namespace/deployment.yaml
index d9bed73131f11..08d30228fad03 100644
--- a/test/e2e/testdata/multi-namespace/deployment.yaml
+++ b/test/e2e/testdata/multi-namespace/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: helm-guestbook
-          image: "gcr.io/heptio-images/ks-guestbook-demo:0.2"
+          image: quay.io/argoprojlabs/argocd-e2e-container:0.2
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
diff --git a/test/e2e/testdata/networking/guestbook-ui-deployment.yaml b/test/e2e/testdata/networking/guestbook-ui-deployment.yaml
index de0f2851efc63..69869e4103ac1 100644
--- a/test/e2e/testdata/networking/guestbook-ui-deployment.yaml
+++ b/test/e2e/testdata/networking/guestbook-ui-deployment.yaml
@@ -14,7 +14,7 @@ spec:
         app: guestbook-ui
     spec:
       containers:
-      - image: gcr.io/heptio-images/ks-guestbook-demo:0.2
+      - image: quay.io/argoprojlabs/argocd-e2e-container:0.2
         name: guestbook-ui
         ports:
         - containerPort: 80
diff --git a/test/e2e/testdata/one-deployment/deployment.yaml b/test/e2e/testdata/one-deployment/deployment.yaml
index 4aaaa9141b7f0..9ddf4a4bcd372 100644
--- a/test/e2e/testdata/one-deployment/deployment.yaml
+++ b/test/e2e/testdata/one-deployment/deployment.yaml
@@ -16,6 +16,6 @@ spec:
       containers:
         - name: main
           command: ["sleep", "999"]
-          image: alpine:3.10.2
+          image: quay.io/argoprojlabs/argocd-e2e-container:0.1
           imagePullPolicy: IfNotPresent
 
diff --git a/test/e2e/testdata/two-nice-pods/pod-1.yaml b/test/e2e/testdata/two-nice-pods/pod-1.yaml
index 31f73520f5498..95187dd42227d 100644
--- a/test/e2e/testdata/two-nice-pods/pod-1.yaml
+++ b/test/e2e/testdata/two-nice-pods/pod-1.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
     - name: main
-      image: alpine:3.10.2
+      image: quay.io/argoprojlabs/argocd-e2e-container:0.1
       imagePullPolicy: IfNotPresent
       command:
         - "true"
diff --git a/test/e2e/testdata/two-nice-pods/pod-2.yaml b/test/e2e/testdata/two-nice-pods/pod-2.yaml
index d7a493015dcc6..588d281e5fd81 100644
--- a/test/e2e/testdata/two-nice-pods/pod-2.yaml
+++ b/test/e2e/testdata/two-nice-pods/pod-2.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
     - name: main
-      image: alpine:3.10.2
+      image: quay.io/argoprojlabs/argocd-e2e-container:0.1
       imagePullPolicy: IfNotPresent
       command:
         - "true"