diff --git a/build-image.sh b/build-image.sh
index 91860f3f..ccf8f0be 100755
--- a/build-image.sh
+++ b/build-image.sh
@@ -5,8 +5,9 @@ set -euo pipefail
 PREFER_PODMAN="${PREFER_PODMAN:-0}"
 PUSH="${PUSH:-0}"
 TAG="${TAG:-latest}"
-REGISTRY_ORG="${REGISTRY_ORG:-vbartoli}"
 SKUPPER_NAME="${SKUPPER_NAME:-skupper}"
+REGISTRY_ORG="quay.io/${REGISTRY_ORG:-skupper}/rhsi-plugin"
+IMAGE=${REGISTRY_ORG}:${TAG}
 
 if [[ -x "$(command -v podman)" && $PREFER_PODMAN == 1 ]]; then
     OCI_BIN="podman"
@@ -14,8 +15,6 @@ else
     OCI_BIN="docker"
 fi
 
-BASE_IMAGE="quay.io/${REGISTRY_ORG}/rhsi-plugin"
-IMAGE=${BASE_IMAGE}:${TAG}
 
 echo "Building image '${IMAGE}' with ${OCI_BIN}"
 $OCI_BIN build --build-arg SKUPPER_NAME="${SKUPPER_NAME}" -t $IMAGE .
diff --git a/manifest.yaml b/manifest.yaml
index 495bf8c2..5e2fa975 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
         - name: openshift-site-plugin
-          image: quay.io/vbartoli/rhsi-plugin:latest
+          image: quay.io/skupper/rhsi-plugin:latest
           ports:
             - containerPort: 9443
               protocol: TCP