diff --git a/SPECS/edge-release/90-default.preset b/SPECS/edge-release/90-default.preset
index e5c72e927b..a15550eead 100644
--- a/SPECS/edge-release/90-default.preset
+++ b/SPECS/edge-release/90-default.preset
@@ -189,3 +189,5 @@ enable ephemeral-disk-warning.service
 
 enable rasdaemon.service
 enable incrond.service
+
+enable docker
diff --git a/SPECS/moby-engine/docker.socket b/SPECS/moby-engine/docker.socket
index 330a1772bc..ebf32bf08f 100644
--- a/SPECS/moby-engine/docker.socket
+++ b/SPECS/moby-engine/docker.socket
@@ -3,7 +3,7 @@ Description=Docker Socket for the API
 PartOf=docker.service
 
 [Socket]
-ListenStream=/var/run/docker.sock
+ListenStream=/run/docker.sock
 SocketMode=0660
 SocketUser=root
 SocketGroup=docker
diff --git a/SPECS/moby-engine/moby-engine.signatures.json b/SPECS/moby-engine/moby-engine.signatures.json
index dcca0b84dd..9e44db9af8 100644
--- a/SPECS/moby-engine/moby-engine.signatures.json
+++ b/SPECS/moby-engine/moby-engine.signatures.json
@@ -1,7 +1,7 @@
 {
  "Signatures": {
   "docker.service": "b150b3ce0947a65c655ed09dfe4e48b7464c60542f9f9902330288bbf87af38e",
-  "docker.socket": "51a06786cae46bc63b7314c25d0bd5bb2e676120d80874b99e35bf60d0b0ffa8",
+  "docker.socket": "cc1b8bd06696541caa64ec96694f1b7aacae8394286125463ead25fb4286b37d",
   "moby-engine-25.0.3.tar.gz": "4cdb516f5d6f5caf8b3bcf93c2962277ba727cfd2d1620176a3bb0cf153b3590"
  }
 }
diff --git a/toolkit/imageconfigs/additionalconfigs/layout.env b/toolkit/imageconfigs/additionalconfigs/layout.env
index 84089bd257..99270db5f1 100644
--- a/toolkit/imageconfigs/additionalconfigs/layout.env
+++ b/toolkit/imageconfigs/additionalconfigs/layout.env
@@ -43,6 +43,9 @@ PERSISTENT_BIND_PATHS+="
 # platform-update-agent package
 PERSISTENT_BIND_PATHS+="
   /var/edge-node/pua"
+# docker
+PERSISTENT_BIND_PATHS+="
+  /opt/docker"
 export PERSISTENT_BIND_PATHS
 
 export PERSISTENT_BIND_TARGET="/opt/.mount/persistence"