diff --git a/.github/workflows/e2e-common.yml b/.github/workflows/e2e-common.yml
index c29c5917..febe590e 100644
--- a/.github/workflows/e2e-common.yml
+++ b/.github/workflows/e2e-common.yml
@@ -131,6 +131,7 @@ jobs:
         run: |
           if [ -f artifacts/image.tar ]; then
             echo "Loading image from archive"
+            USER=${USER:-fink-ci}
             cluster_name="$USER-$(git rev-parse --abbrev-ref HEAD)"
             kind load image-archive artifacts/image.tar --name "$cluster_name"
             node=$(kubectl get nodes --selector=node-role.kubernetes.io/control-plane -o jsonpath='{.items[0].metadata.name}')
diff --git a/.github/workflows/attic/e2e-noscience.yml b/.github/workflows/e2e-noscience.yml
similarity index 100%
rename from .github/workflows/attic/e2e-noscience.yml
rename to .github/workflows/e2e-noscience.yml
diff --git a/e2e/prereq-install.sh b/e2e/prereq-install.sh
index a444626a..0138960f 100755
--- a/e2e/prereq-install.sh
+++ b/e2e/prereq-install.sh
@@ -7,6 +7,9 @@
 set -euxo pipefail
 
 kind_version_opt=""
+
+# TODO manage cluster name inside ktbx
+USER=${USER:-fink-ci}
 cluster_name="$USER-$(git rev-parse --abbrev-ref HEAD | tr '[:upper:]' '[:lower:]')"
 
 # Get kind version from option -k