diff --git a/files/common/lib/systemd/system/systemd-reexec.service b/files/common/lib/systemd/system/systemd-reexec.service
new file mode 100644
index 000000000..4ffdeb863
--- /dev/null
+++ b/files/common/lib/systemd/system/systemd-reexec.service
@@ -0,0 +1,22 @@
+#
+# Copyright 2021 Delphix
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+[Unit]
+After=local-fs.target
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c "busctl status org.freedesktop.systemd1 &>/dev/null || systemctl daemon-reexec"
diff --git a/files/common/lib/systemd/system/systemd-reexec.timer b/files/common/lib/systemd/system/systemd-reexec.timer
new file mode 100644
index 000000000..bc872dcbe
--- /dev/null
+++ b/files/common/lib/systemd/system/systemd-reexec.timer
@@ -0,0 +1,19 @@
+#
+# Copyright 2021 Delphix
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+[Timer]
+OnBootSec=15min
+OnUnitActiveSec=1hour