diff --git a/cmd/cozystack-operator/main.go b/cmd/cozystack-operator/main.go
index 10102bc0..34172d95 100644
--- a/cmd/cozystack-operator/main.go
+++ b/cmd/cozystack-operator/main.go
@@ -230,8 +230,11 @@ func main() {
 	{
 		sourceRefKind := "OCIRepository"
 		if platformSourceURL != "" {
-			sourceType, _, _ := parsePlatformSourceURL(platformSourceURL)
-			// Error already checked by installPlatformSourceResource above
+			sourceType, _, err := parsePlatformSourceURL(platformSourceURL)
+			if err != nil {
+				setupLog.Error(err, "failed to parse platform source URL for PackageSource")
+				os.Exit(1)
+			}
 			if sourceType == "git" {
 				sourceRefKind = "GitRepository"
 			}
diff --git a/hack/e2e-install-cozystack.bats b/hack/e2e-install-cozystack.bats
index 815622bc..2cfebfbf 100644
--- a/hack/e2e-install-cozystack.bats
+++ b/hack/e2e-install-cozystack.bats
@@ -23,6 +23,9 @@
   kubectl wait crd/packages.cozystack.io --for=condition=Established --timeout=2m
   kubectl wait crd/packagesources.cozystack.io --for=condition=Established --timeout=2m
 
+  # Wait for operator to create the platform PackageSource
+  timeout 120 sh -ec 'until kubectl get packagesource cozystack.cozystack-platform >/dev/null 2>&1; do sleep 2; done'
+
   # Create platform Package with isp-full variant
   kubectl apply -f - <<EOF
 apiVersion: cozystack.io/v1alpha1