diff --git a/infra/azure/azure-pipelines.yml b/infra/azure/azure-pipelines.yml
index 584cabec..b79f9825 100644
--- a/infra/azure/azure-pipelines.yml
+++ b/infra/azure/azure-pipelines.yml
@@ -3,7 +3,7 @@ trigger:
 - master
 
 pool:
-  vmImage: 'ubuntu-20.04'
+  vmImage: 'ubuntu-24.04'
 
 variables:
   ansible_version: "-core >=2.16,<2.17"
diff --git a/infra/azure/nightly.yml b/infra/azure/nightly.yml
index 2790199e..7eb3a30b 100644
--- a/infra/azure/nightly.yml
+++ b/infra/azure/nightly.yml
@@ -10,7 +10,7 @@ schedules:
 trigger: none
 
 pool:
-  vmImage: 'ubuntu-20.04'
+  vmImage: 'ubuntu-24.04'
 
 variables:
   # We need to have two sets, as c8s is not supported by all ansible versions
diff --git a/infra/azure/pr-pipeline.yml b/infra/azure/pr-pipeline.yml
index 648a554e..d87b24d9 100644
--- a/infra/azure/pr-pipeline.yml
+++ b/infra/azure/pr-pipeline.yml
@@ -3,7 +3,7 @@ trigger:
 - master
 
 pool:
-  vmImage: 'ubuntu-20.04'
+  vmImage: 'ubuntu-24.04'
 
 variables:
   distros: "fedora-latest,c10s,c9s,c8s,fedora-rawhide"
diff --git a/infra/image/shcontainer b/infra/image/shcontainer
index a2d36c65..636cd678 100644
--- a/infra/image/shcontainer
+++ b/infra/image/shcontainer
@@ -47,6 +47,8 @@ container_start() {
 
     log info "= Starting ${name} ="
     podman start "${name}"
+    # Ensure /etc/shadow is readable
+    podman exec "${name}" bash -c "chmod u+r /etc/shadow"
     echo
 }
 
diff --git a/utils/setup_test_container.sh b/utils/setup_test_container.sh
index 0916c27f..2cd11dc3 100755
--- a/utils/setup_test_container.sh
+++ b/utils/setup_test_container.sh
@@ -79,6 +79,20 @@ shift
 prepare_container "${scenario}" "${IMAGE_TAG}"
 start_container "${scenario}"
 
+log info "Wait till systemd-journald is running"
+max=20
+wait=2
+count=0
+while ! podman exec "${scenario}" ps -x | grep -q "systemd-journald"
+do
+    if [ $count -ge $max ]; then
+        die "Timeout: systemd-journald is not starting up"
+    fi
+    count=$((count+1))
+    log none "Waiting ${wait} seconds .."
+    sleep ${wait}
+done
+
 # wait for FreeIPA services to be available (usually ~45 seconds)
 log info "Wait for container to be initialized."
 wait=15