diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml
index 17225d0..02e3543 100644
--- a/packages/static/kairos-overlay-files/collection.yaml
+++ b/packages/static/kairos-overlay-files/collection.yaml
@@ -1,4 +1,4 @@
 packages:
   - name: "kairos-overlay-files"
     category: "static"
-    version: "1.5.0"
+    version: "1.5.1"
diff --git a/packages/static/kairos-overlay-files/files/system/oem/00_datasource.yaml b/packages/static/kairos-overlay-files/files/system/oem/00_datasource.yaml
index e01f881..f13291b 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/00_datasource.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/00_datasource.yaml
@@ -2,7 +2,10 @@ name: "Datasource handling"
 stages:
   rootfs.before:
     - &datasource
-      if: '[ ! -f /oem/userdata ]'
+      if: |
+        (grep -q "install-mode" /proc/cmdline || grep -q "nodepair.enable" /proc/cmdline ) && \
+        ([ -f /run/cos/live_mode ] || [ -f /run/cos/uki_install_mode ]) && \
+        ( [ ! -f /oem/userdata ] )
       name: "Pull data from provider"
       datasource:
         providers: ["cdrom", "gcp", "openstack", "aws", "azure", "hetzner", "packet", "vultr", "digitalocean", "metaldata", "vmware", "config-drive"]
diff --git a/packages/utils/edgevpn/build.yaml b/packages/utils/edgevpn/build.yaml
index f12be7f..8324752 100644
--- a/packages/utils/edgevpn/build.yaml
+++ b/packages/utils/edgevpn/build.yaml
@@ -9,7 +9,7 @@ env:
 - GOPATH=/luetbuild/go/
 - GITHUB_ORG={{ ( index .Values.labels "github.owner" ) }}
 - CGO_ENABLED=0
-- PACKAGE_VERSION={{ .Values.tag }}
+- PACKAGE_VERSION={{ .Values.version }}
 steps:
 - |
   PACKAGE_VERSION=${PACKAGE_VERSION%\-*} && \
diff --git a/packages/utils/edgevpn/definition.yaml b/packages/utils/edgevpn/definition.yaml
index 16d57c0..85841f2 100644
--- a/packages/utils/edgevpn/definition.yaml
+++ b/packages/utils/edgevpn/definition.yaml
@@ -1,7 +1,6 @@
 name: edgevpn
 category: utils
-version: "0.28.3"
-tag: "0.24.6"
+version: "0.28.3-1"
 labels:
   github.repo: "edgevpn"
   github.owner: "mudler"