diff --git a/docker.yaml b/docker.yaml
index 43ed5d9754d..052ab925805 100644
--- a/docker.yaml
+++ b/docker.yaml
@@ -1,7 +1,7 @@
 package:
   name: docker
   version: "27.5.1"
-  epoch: 0
+  epoch: 1
   description: A meta package for Docker Engine and Docker CLI
   copyright:
     - license: Apache-2.0
@@ -188,9 +188,12 @@ subpackages:
     pipeline:
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/usr/lib/systemd/system/
+          mkdir -p ${{targets.subpkgdir}}/usr/lib/systemd/system-preset/
           install -Dm644 contrib/init/systemd/docker.socket "${{targets.subpkgdir}}"/usr/lib/systemd/system/
           install -Dm644 contrib/init/systemd/docker.service "${{targets.subpkgdir}}"/usr/lib/systemd/system/
           sed -i "s|\[Service\]|[Service]\nEnvironment="PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"|g" "${{targets.subpkgdir}}"/usr/lib/systemd/system/docker.service
+          echo "enable docker.service" > "${{targets.subpkgdir}}/usr/lib/systemd/system-preset/81-docker.preset"
+          echo "enable docker.socket" >> "${{targets.subpkgdir}}/usr/lib/systemd/system-preset/81-docker.preset"
 
 update:
   enabled: true
diff --git a/openssh.yaml b/openssh.yaml
index be97073c908..df27ad7ea9c 100644
--- a/openssh.yaml
+++ b/openssh.yaml
@@ -1,7 +1,7 @@
 package:
   name: openssh
   version: 9.9_p1
-  epoch: 3
+  epoch: 4
   description: "the OpenBSD SSH implementation"
   copyright:
     - license: ISC
@@ -151,7 +151,9 @@ subpackages:
     pipeline:
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/usr/lib/systemd/system
+          mkdir -p ${{targets.subpkgdir}}/usr/lib/systemd/system-preset/
           install -Dm644  sshd.service "${{targets.subpkgdir}}"/usr/lib/systemd/system
+          echo "enable sshd.service" > "${{targets.subpkgdir}}/usr/lib/systemd/system-preset/80-sshd.preset"
     dependencies:
       runtime:
         - systemd
diff --git a/systemd.yaml b/systemd.yaml
index 1c973200a86..f1a8d572741 100644
--- a/systemd.yaml
+++ b/systemd.yaml
@@ -1,7 +1,7 @@
 package:
   name: systemd
   version: "257.2"
-  epoch: 7
+  epoch: 8
   description: The systemd System and Service Manager
   copyright:
     - license: LGPL-2.1-or-later AND GPL-2.0-or-later
@@ -369,17 +369,21 @@ subpackages:
       runtime:
         - ${{package.name}}
         - tzdata
+        - agetty
         - mount
+        - kbd
+        - agetty
     pipeline:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/etc ${{targets.subpkgdir}}/sbin
           ln -s ../usr/lib/systemd/systemd ${{targets.subpkgdir}}/sbin/init
-          ln -sf ../usr/share/zoneinfo/UTC ${{targets.subpkgdir}}/etc/localtime
+          ln -s ../run/systemd/resolve/stub-resolv.conf "${{targets.subpkgdir}}/etc/resolv.conf"
+          echo "uninitialized" > "${{targets.subpkgdir}}/etc/machine-id"
     test:
       pipeline:
         - runs: |
             [ -f /sbin/init -a -x /sbin/init ]
-            [ -f /etc/localtime ]
+            grep "uninitialized" /etc/machine-id
 
   - name: "systemd-default-network"
     description: "Configure network to DHCP on default interfaces"
@@ -531,5 +535,5 @@ test:
         rm test.c test_systemd
     - name: "Verify stanalone binaries removed"
       runs: |
-        STANDALONE_BINARIES=$(find / -name '*.standalone')
+        STANDALONE_BINARIES=$(find /usr -name '*.standalone' )
         test -z "${STANDALONE_BINARIES}"