diff --git a/web/messages/en/edge_wizard.json b/web/messages/en/edge_wizard.json
index 2b4d81c99e..42fa5acd21 100644
--- a/web/messages/en/edge_wizard.json
+++ b/web/messages/en/edge_wizard.json
@@ -57,7 +57,7 @@
   "edge_setup_step_deploy_tabs_package_subtitle": "To add Defguard APT repository and install the package, run the following commands:",
   "edge_setup_step_deploy_tabs_virtual_image": "Virtual Image",
   "edge_setup_step_deploy_tabs_virtual_title": "Virtual Image",
-  "edge_setup_step_deploy_tabs_virtual_subtitle": "Download latest Edge Virtual Image (in OVH format) from this url: [{url}]({url}) Prepare a Cloud Init configuration: **{filename}**:",
+  "edge_setup_step_deploy_tabs_virtual_subtitle": "Download latest Edge Virtual Image (in OVA format) from this url: [{url}]({url}). Then include the snippet below as part of your cloud-init or create and attach a dedicated cloud-init userdata file: **{filename}**:",
   "edge_setup_step_deploy_tabs_other": "Other methods",
   "edge_setup_step_deploy_tabs_other_title": "Other methods",
   "edge_setup_step_deploy_tabs_other_subtitle": "For other deployment methods, please follow to our documentation section",
diff --git a/web/messages/en/gateway_wizard.json b/web/messages/en/gateway_wizard.json
index b90c21f110..9c38211bf5 100644
--- a/web/messages/en/gateway_wizard.json
+++ b/web/messages/en/gateway_wizard.json
@@ -57,7 +57,7 @@
   "gateway_setup_step_deploy_tabs_package_subtitle": "To add Defguard APT repository and install the package, run the following commands:",
   "gateway_setup_step_deploy_tabs_virtual_image": "Virtual Image",
   "gateway_setup_step_deploy_tabs_virtual_title": "Virtual Image",
-  "gateway_setup_step_deploy_tabs_virtual_subtitle": "Download latest Defguard Virtual Image (in OVH format) from this url: [{url}]({url}) Prepare a Cloud Init configuration: **{filename}**:",
+  "gateway_setup_step_deploy_tabs_virtual_subtitle": "Download latest Defguard Virtual Image (in OVA format) from this url: [{url}]({url}). Then include the snippet below as part of your cloud-init or create and attach a dedicated cloud-init userdata file: **{filename}**:",
   "gateway_setup_step_deploy_tabs_other": "Other methods",
   "gateway_setup_step_deploy_tabs_other_title": "Other methods",
   "gateway_setup_step_deploy_tabs_other_subtitle": "For other deployment methods, please follow to our documentation section",
diff --git a/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx b/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx
index 29c710f175..42db17c5fa 100644
--- a/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx
+++ b/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx
@@ -125,15 +125,20 @@ const DockerComposeTab = () => {
       />
       <CodeSnippet
         value={`services:
-  defguard-gateway:
+  gateway:
     image: ghcr.io/defguard/gateway:latest
     restart: unless-stopped
     network_mode: host
+    cap_add:
+      - NET_ADMIN
     # If you prefer only one port:
     #ports:
     #  - "50066:50066"
+    # Uncomment the following if you are running on Debian 13 or later or have apparmor or SELinux setup
+    #security_opt:
+    #  - apparmor:unconfined
     volumes:
-      - ./certs:/certs`}
+      - ./.volumes/certs/gateway:/etc/defguard/certs`}
       />
       <SizedBox height={ThemeSpacing.Xl2} />
       <AppText font={TextStyle.TBodySm400}>
@@ -153,7 +158,7 @@ const DockerTab = () => {
         subtitle={m.gateway_setup_step_deploy_tabs_docker_subtitle()}
       />
       <CodeSnippet
-        value={`docker run -v ./certs:/certs --restart unless-stopped --network host --cap-add NET_ADMIN ghcr.io/defguard/gateway:latest`}
+        value={`docker run -v ./.volumes/certs/gateway:/etc/defguard/certs --restart unless-stopped --security-opt apparmor:unconfined --network host --cap-add NET_ADMIN ghcr.io/defguard/gateway:latest`}
       />
     </>
   );
@@ -191,25 +196,18 @@ const VirtualImageTab = () => {
       <TabContentHeader
         title={m.gateway_setup_step_deploy_tabs_virtual_title()}
         subtitle={m.gateway_setup_step_deploy_tabs_virtual_subtitle({
-          url: `https://defguard.net/download/defguard-2x-latest.ovf`,
-          filename: `cloud-init-yaml`,
+          url: `https://defguard-downloads.s3.eu-central-1.amazonaws.com/defguard-alpha2.ova`,
+          filename: `defguard-data.yaml`,
         })}
       />
       <CodeSnippet
-        value={`launch: gateway
-
-runcmd:
-  - |
-    LAUNCH=$(jq -r '.["user-data"].launch' /run/cloud-init/instance-data.json)
-    
-    echo "Launch option = $LAUNCH"
-    
-    if [ "$LAUNCH" = "gateway" ]; then
-      systemctl enable defguard-gateway
-      systemctl start defguard-gateway
-    else
-      echo "Unknown launch: $LAUNCH"
-    fi`}
+        value={`#cloud-config
+write_files:
+  - path: /opt/defguard/active-profiles
+    permissions: '0644'
+    content: |
+      gateway
+`}
       />
     </>
   );
diff --git a/web/src/pages/PlaygroundPage/PlaygroundPage.tsx b/web/src/pages/PlaygroundPage/PlaygroundPage.tsx
index 55854468b7..5da0fa2cd4 100644
--- a/web/src/pages/PlaygroundPage/PlaygroundPage.tsx
+++ b/web/src/pages/PlaygroundPage/PlaygroundPage.tsx
@@ -125,15 +125,12 @@ export const PlaygroundPage = () => {
         <SizedBox height={1} width={600} />
         <CodeSnippet
           value={`services:
-  defguard-gateway:
-    image: ghcr.io/defguard/defguard-proxy:latest
-    restart: unless-stopped
-    network_mode: host
-    # If you prefer only one port:
-    #ports:
-    #  - "50066:50066"
+  gateway:
+    image: ghcr.io/defguard/gateway:latest
+    cap_add:
+      - NET_ADMIN
     volumes:
-      - ./certs:/certs`}
+      - ./.volumes/certs/gateway:/etc/defguard/certs`}
         />
       </Card>
       <Divider spacing={ThemeSpacing.Sm} />
diff --git a/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx
index c001255da4..f50cbbbb13 100644
--- a/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx
+++ b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx
@@ -112,12 +112,17 @@ const DockerComposeTab = () => {
       />
       <CodeSnippet
         value={`services:
-  proxy:
+  edge:
     image: ghcr.io/defguard/defguard-proxy:latest
     restart: unless-stopped
     ports:
-      - "127.0.0.1:8080:8080"
-      - "50051:50051"`}
+      - "8080:8080"
+      - "50051:50051"
+    # Uncomment the following if you are running on Debian 13 or later or have apparmor or SELinux setup
+    #security_opt:
+    #  - apparmor:unconfined
+    volumes:
+      - ./.volumes/certs/edge:/etc/defguard/certs`}
       />
       <SizedBox height={ThemeSpacing.Xl2} />
       <AppText font={TextStyle.TBodySm400}>
@@ -137,7 +142,7 @@ const DockerTab = () => {
         subtitle={m.edge_setup_step_deploy_tabs_docker_subtitle()}
       />
       <CodeSnippet
-        value={`docker run --restart unless-stopped ghcr.io/defguard/defguard-proxy:latest`}
+        value={`docker run --restart unless-stopped --security-opt apparmor:unconfined -p 8080:8080 -p 50051:50051 -v ./.volumes/certs/edge:/etc/defguard/certs ghcr.io/defguard/defguard-proxy:latest`}
       />
     </>
   );
@@ -175,25 +180,18 @@ const VirtualImageTab = () => {
       <TabContentHeader
         title={m.edge_setup_step_deploy_tabs_virtual_title()}
         subtitle={m.edge_setup_step_deploy_tabs_virtual_subtitle({
-          url: `https://defguard.net/download/defguard-2x-latest.ovf`,
-          filename: `cloud-init-yaml`,
+          url: `https://defguard-downloads.s3.eu-central-1.amazonaws.com/defguard-alpha2.ova`,
+          filename: `defguard-data.yaml`,
         })}
       />
       <CodeSnippet
-        value={`launch: gateway
-
-runcmd:
-  - |
-    LAUNCH=$(jq -r '.["user-data"].launch' /run/cloud-init/instance-data.json)
-    
-    echo "Launch option = $LAUNCH"
-    
-    if [ "$LAUNCH" = "gateway" ]; then
-      systemctl enable defguard-gateway
-      systemctl start defguard-gateway
-    else
-      echo "Unknown launch: $LAUNCH"
-    fi`}
+        value={`#cloud-config
+write_files:
+  - path: /opt/defguard/active-profiles
+    permissions: '0644'
+    content: |
+      edge
+`}
       />
     </>
   );