diff --git a/.github/scripts/update-versions.sh b/.github/scripts/update-versions.sh
index 2689e9c..23a6aea 100755
--- a/.github/scripts/update-versions.sh
+++ b/.github/scripts/update-versions.sh
@@ -32,7 +32,7 @@ jq -r ".[].name" "${CHARTJSON}" | while read -r NAME; do
   echo Processing: "${NAME}"
   echo "  chart: ${REGISTRY}"
   echo "  current version: ${VERSION}"
-  LATEST_VERSION=$(crane ls "$REGISTRY" | grep 'v[0-9]*\.[0-9]*\.[0-9]\.*$' | sort -V -r | head -n 1)
+  LATEST_VERSION=$(crane ls "$REGISTRY" | grep 'v\?[0-9]*\.[0-9]*\.[0-9]\.*$' | sort -V -r | head -n 1)
   echo "  latest version: ${LATEST_VERSION}"
   if [ "x${VERSION}" != "x${LATEST_VERSION}" ]; then
     echo "  New version found!"
diff --git a/.github/tests/charts.json b/.github/tests/charts.json
index 3816362..4325a1c 100644
--- a/.github/tests/charts.json
+++ b/.github/tests/charts.json
@@ -13,15 +13,5 @@
     "name": "ingress-nginx",
     "repo": "https://kubernetes.github.io/ingress-nginx",
     "version": "4.11.3"
-  },
-  {
-    "name": "mysql",
-    "repo": "https://charts.bitnami.com/bitnami",
-    "version": "12.0.0"
-  },
-  {
-    "name": "postgresql",
-    "repo": "https://charts.bitnami.com/bitnami",
-    "version": "16.2.1"
   }
 ]
diff --git a/.github/tests/oci-charts.json b/.github/tests/oci-charts.json
index 7e01214..26d8261 100644
--- a/.github/tests/oci-charts.json
+++ b/.github/tests/oci-charts.json
@@ -1,7 +1,17 @@
 [
+  {
+    "name": "mysql",
+    "registry": "docker.io/bitnamicharts/mysql",
+    "version": "12.2.0"
+  },
+  {
+    "name": "postgresql",
+    "registry": "docker.io/bitnamicharts/postgresql",
+    "version": "16.3.0"
+  },
   {
     "name": "envoy-gateway",
     "registry": "docker.io/envoyproxy/gateway-helm",
-    "version": ""
+    "version": "v1.2.3"
   }
 ]
diff --git a/.github/tests/pre-install.sh b/.github/tests/pre-install.sh
index bed4f1d..05ef591 100755
--- a/.github/tests/pre-install.sh
+++ b/.github/tests/pre-install.sh
@@ -37,13 +37,13 @@ kubectl wait --namespace ingress-nginx --for=condition=ready --timeout 60s pod -
 # external database
 
 # mysql
-"${helm_install[@]}" mysql mysql --version "$VERSION_MYSQL" --repo "$HELM_REPO_MYSQL" \
+"${helm_install[@]}" mysql "${HELM_REGISTRY_MYSQL}" --version "$VERSION_MYSQL" \
   --namespace mysql \
   --values "${DEPS}/mysql.yaml" \
   --wait
 
 # postgres
-"${helm_install[@]}" postgresql postgresql --version "$VERSION_POSTGRESQL" --repo "$HELM_REPO_POSTGRESQL" \
+"${helm_install[@]}" postgresql "${HELM_REGISTRY_POSTGRESQL}" --version "$VERSION_POSTGRESQL" \
   --namespace postgresql \
   --values "${DEPS}/postgresql.yaml" \
   --wait
diff --git a/examples/external-mysql/run-tests.sh b/examples/external-mysql/run-tests.sh
index 6f3bd7a..ece87d4 100755
--- a/examples/external-mysql/run-tests.sh
+++ b/examples/external-mysql/run-tests.sh
@@ -48,7 +48,7 @@ kubectl label namespace spire-system pod-security.kubernetes.io/enforce=privileg
 kubectl create namespace spire-server --dry-run=client -o yaml | kubectl apply -f -
 kubectl label namespace spire-server pod-security.kubernetes.io/enforce=restricted || true
 
-helm upgrade --install mysql mysql --version "$VERSION_MYSQL" --repo "$HELM_REPO_MYSQL" \
+helm upgrade --install mysql "${HELM_REGISTRY_MYSQL}" --version "$VERSION_MYSQL" \
   --namespace spire-server \
   --values "${DEPS}/mysql.yaml" \
   --wait
diff --git a/examples/external-postgresql/run-tests.sh b/examples/external-postgresql/run-tests.sh
index fe9ba70..363cdff 100755
--- a/examples/external-postgresql/run-tests.sh
+++ b/examples/external-postgresql/run-tests.sh
@@ -48,7 +48,7 @@ kubectl label namespace spire-system pod-security.kubernetes.io/enforce=privileg
 kubectl create namespace spire-server --dry-run=client -o yaml | kubectl apply -f -
 kubectl label namespace spire-server pod-security.kubernetes.io/enforce=restricted || true
 
-helm upgrade --install postgresql postgresql --version "$VERSION_POSTGRESQL" --repo "$HELM_REPO_POSTGRESQL" \
+helm upgrade --install postgresql "${HELM_REGISTRY_POSTGRESQL}" --version "$VERSION_POSTGRESQL" \
   --namespace spire-server \
   --values "${DEPS}/postgresql.yaml" \
   --wait
diff --git a/examples/stateless-server/run-tests.sh b/examples/stateless-server/run-tests.sh
index 6f3bd7a..ece87d4 100755
--- a/examples/stateless-server/run-tests.sh
+++ b/examples/stateless-server/run-tests.sh
@@ -48,7 +48,7 @@ kubectl label namespace spire-system pod-security.kubernetes.io/enforce=privileg
 kubectl create namespace spire-server --dry-run=client -o yaml | kubectl apply -f -
 kubectl label namespace spire-server pod-security.kubernetes.io/enforce=restricted || true
 
-helm upgrade --install mysql mysql --version "$VERSION_MYSQL" --repo "$HELM_REPO_MYSQL" \
+helm upgrade --install mysql "${HELM_REGISTRY_MYSQL}" --version "$VERSION_MYSQL" \
   --namespace spire-server \
   --values "${DEPS}/mysql.yaml" \
   --wait