diff --git a/toolkit/imageconfigs/additionalconfigs/add-docker-group.sh b/toolkit/imageconfigs/additionalconfigs/add-docker-group.sh
new file mode 100755
index 0000000000..9a52408727
--- /dev/null
+++ b/toolkit/imageconfigs/additionalconfigs/add-docker-group.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+if id "guest" &>/dev/null; then
+    usermod -aG docker guest
+fi
diff --git a/toolkit/imageconfigs/edge-image-desktop-virtualization-dev.json b/toolkit/imageconfigs/edge-image-desktop-virtualization-dev.json
index 5263306e3e..8605cea482 100644
--- a/toolkit/imageconfigs/edge-image-desktop-virtualization-dev.json
+++ b/toolkit/imageconfigs/edge-image-desktop-virtualization-dev.json
@@ -97,6 +97,9 @@
                 },
                 {
                         "Path": "additionalconfigs/add-sudoer.sh"
+                },
+                {
+                        "Path": "additionalconfigs/add-docker-group.sh"
                 }
             ],
             "KernelOptions": {
diff --git a/toolkit/imageconfigs/edge-image-dev.json b/toolkit/imageconfigs/edge-image-dev.json
index a70192712f..abf86bc99f 100644
--- a/toolkit/imageconfigs/edge-image-dev.json
+++ b/toolkit/imageconfigs/edge-image-dev.json
@@ -91,6 +91,9 @@
                 },
                 {
                         "Path": "additionalconfigs/add-sudoer.sh"
+                },
+                {
+                        "Path": "additionalconfigs/add-docker-group.sh"
                 }
             ],
             "KernelOptions": {
diff --git a/toolkit/imageconfigs/edge-image-rt-dev.json b/toolkit/imageconfigs/edge-image-rt-dev.json
index b50ab6d82c..88265b5f2c 100644
--- a/toolkit/imageconfigs/edge-image-rt-dev.json
+++ b/toolkit/imageconfigs/edge-image-rt-dev.json
@@ -91,6 +91,9 @@
                 },
                 {
                         "Path": "additionalconfigs/add-sudoer.sh"
+                },
+                {
+                        "Path": "additionalconfigs/add-docker-group.sh"
                 }
             ],
             "KernelOptions": {