diff --git a/.dockerignore b/.dockerignore
index 81e5902bc61473..e778fce267438e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -18,8 +18,10 @@ hack/
 docs/
 examples/
 .github/
-!test/fixture
 !test/container
+!test/e2e/testdata
+!test/fixture
+!test/remote
 !hack/installers
 !hack/gpg-wrapper.sh
 !hack/git-verify-wrapper.sh
diff --git a/test/remote/Makefile b/test/remote/Makefile
index 5925d3745d968f..4bc9b90811b650 100644
--- a/test/remote/Makefile
+++ b/test/remote/Makefile
@@ -2,8 +2,8 @@ PWD=$(shell pwd)
 TEST_ROOT=$(shell realpath $(PWD)/../..)
 
 IMAGE_NAMESPACE?=
-IMAGE_NAME=argocd-e2e-cluster
-IMAGE_TAG=latest
+IMAGE_NAME?=argocd-e2e-cluster
+IMAGE_TAG?=latest
 ifneq (${IMAGE_NAMESPACE},)
 IMAGE_PREFIX=$(IMAGE_NAMESPACE)/
 else
diff --git a/test/remote/README.md b/test/remote/README.md
index 25364ab61c26b0..0c05dce914d325 100644
--- a/test/remote/README.md
+++ b/test/remote/README.md
@@ -128,7 +128,7 @@ Run the tests
 In another shell, do a port-forward to the API server's service:
 
 ```shell
-kubectl -n argocd-e2e port-forward svc/argocd-server 443:4443
+kubectl -n argocd-e2e port-forward svc/argocd-server 4443:443
 ```
 
 Set Argo CD Server port:
@@ -140,7 +140,7 @@ export ARGOCD_SERVER=127.0.0.1:4443
 Set the admin password to use:
 
 ```shell
-export ARGOCD_E2E_ADMIN_PASSWORD=$(kubectl get secrets argocd-initial-admin-secret -o jsonpath='{.data.password}'|base64 -d)
+export ARGOCD_E2E_ADMIN_PASSWORD=$(kubectl -n argocd-e2e get secrets argocd-initial-admin-secret -o jsonpath='{.data.password}'|base64 -d)
 ```
 
 Run the tests