diff --git a/Dockerfile.e2e b/Dockerfile.e2e
index 7bac23c..95a0003 100644
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -4,9 +4,10 @@ RUN apk update && apk add curl bash
 RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && chmod 700 get_helm.sh && VERIFY_CHECKSUM=false ./get_helm.sh
 
 WORKDIR /source
-COPY ./bin/egressd-e2e /usr/local/bin/egressd-e2e
+ARG TARGETARCH
+COPY ./bin/egressd-$TARGETARCH-e2e /usr/local/bin/egressd-e2e
 COPY ./charts ./charts
 ARG image_tag
 ENV env_image_tag $image_tag
 
-CMD ["sh", "-c", "/usr/local/bin/egressd-e2e -image-tag=${env_image_tag}"]
\ No newline at end of file
+CMD ["sh", "-c", "/usr/local/bin/egressd-e2e -image-tag=${env_image_tag}"]
diff --git a/e2e/run.sh b/e2e/run.sh
index c3ecd12..2792d39 100755
--- a/e2e/run.sh
+++ b/e2e/run.sh
@@ -11,7 +11,8 @@ then
   exit 1
 fi
 
-name=egressd
+name=egressd-$GOARCH
+exporter_name=egressd-exporter-$GOARCH
 
 # Build e2e docker image.
 pushd ./e2e
@@ -28,9 +29,9 @@ then
   docker build . -t $name:local -f Dockerfile
   kind load docker-image $name:local --name $KIND_CONTEXT
 
-  GOOS=linux GOARCH=$GOARCH CGO_ENABLED=0 go build -o bin/$name-exporter ./cmd/exporter
-  docker build . -t $name-exporter:local -f Dockerfile.exporter
-  kind load docker-image $name-exporter:local --name $KIND_CONTEXT
+  GOOS=linux GOARCH=$GOARCH CGO_ENABLED=0 go build -o bin/$exporter_name ./cmd/exporter
+  docker build . -t $exporter_name:local -f Dockerfile.exporter
+  kind load docker-image $exporter_name:local --name $KIND_CONTEXT
 fi
 
 # Deploy e2e resources.
@@ -52,7 +53,7 @@ function printJobLogs() {
 }
 trap printJobLogs EXIT
 
-ns="castai-$name-e2e"
+ns="castai-egressd-e2e"
 kubectl delete ns $ns --force || true
 kubectl create ns $ns || true
 kubectl config set-context --current --namespace=$ns