diff --git a/ci/validate.sh b/ci/validate.sh
index d5e68ea6a..82dcd6621 100755
--- a/ci/validate.sh
+++ b/ci/validate.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 set -xeuo pipefail
+
+# Create a temporary copy
+workdir="$(mktemp -d)"
+echo "Using $workdir as working directory"
+cd "$workdir"
+git clone /go/src/github.com/openshift/os os
+cd os
 # First ensure submodules are initialized
 git submodule update --init --recursive
 # Basic syntax check
diff --git a/manifest.yaml b/manifest.yaml
index 866fc24e5..45859f0b3 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -223,6 +223,8 @@ packages:
  # Used on the bootstrap node
  - systemd-journal-remote
  # Extras
+ # Pin systemd version until we solve https://bugzilla.redhat.com/show_bug.cgi?id=2109546
+ - "'systemd <= 239-45.el8_4.10'"
  - systemd-journal-gateway
  # RHEL7 compatibility
  - compat-openssl10