diff --git a/php/public/disable-docker-socket-proxy.js b/php/public/disable-docker-socket-proxy.js
index 79099423..7491042e 100644
--- a/php/public/disable-docker-socket-proxy.js
+++ b/php/public/disable-docker-socket-proxy.js
@@ -1,4 +1,7 @@
 document.addEventListener("DOMContentLoaded", function(event) {
     // Docker socket proxy
-    document.getElementById("docker-socket-proxy").disabled = true;
+    let dockerSocketProxy = document.getElementById("docker-socket-proxy");
+    if (dockerSocketProxy) {
+        dockerSocketProxy.disabled = true;
+    }
 });
diff --git a/php/public/options-form-submit.js b/php/public/options-form-submit.js
index a8a4411d..75a52c85 100644
--- a/php/public/options-form-submit.js
+++ b/php/public/options-form-submit.js
@@ -62,6 +62,8 @@ document.addEventListener("DOMContentLoaded", function(event) {
 
     // Docker socket proxy
     let dockerSocketProxy = document.getElementById("docker-socket-proxy");
-    dockerSocketProxy.addEventListener('change', makeOptionsFormSubmitVisible);
-    dockerSocketProxy.addEventListener('change', handleDockerSocketProxyWarning);
+    if (dockerSocketProxy) {
+        dockerSocketProxy.addEventListener('change', makeOptionsFormSubmitVisible);
+        dockerSocketProxy.addEventListener('change', handleDockerSocketProxyWarning);
+    }
 });
diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php
index 4ed45411..f982e750 100644
--- a/php/src/Docker/DockerActionManager.php
+++ b/php/src/Docker/DockerActionManager.php
@@ -412,11 +412,7 @@ class DockerActionManager
                 $portWithProtocol = $value->port . '/' . $value->protocol;
                 $exposedPorts[$portWithProtocol] = null;
             }
-            if ($container->GetIdentifier() !== 'nextcloud-aio-docker-socket-proxy') {
-                $requestBody['HostConfig']['NetworkMode'] = 'nextcloud-aio';
-            } else {
-                $requestBody['HostConfig']['NetworkMode'] = 'nextcloud-aio-docker-socket-proxy-network';
-            }
+            $requestBody['HostConfig']['NetworkMode'] = 'nextcloud-aio';
         } else {
             $requestBody['HostConfig']['NetworkMode'] = 'host';
         }
@@ -827,19 +823,13 @@ class DockerActionManager
     public function ConnectMasterContainerToNetwork() : void
     {
         $this->ConnectContainerIdToNetwork('nextcloud-aio-mastercontainer', '');
-        $this->ConnectContainerIdToNetwork('nextcloud-aio-mastercontainer', '', 'nextcloud-aio-docker-socket-proxy-network');
         // Don't disconnect here since it slows down the initial login by a lot. Is getting done during cron.sh instead.
         // $this->DisconnectContainerFromBridgeNetwork('nextcloud-aio-mastercontainer');
     }
 
     public function ConnectContainerToNetwork(Container $container) : void
     {
-        if ($container->GetIdentifier() !== 'nextcloud-aio-docker-socket-proxy') {
-            $this->ConnectContainerIdToNetwork($container->GetIdentifier(), $container->GetInternalPort());
-        }
-        if ($container->GetIdentifier() === 'nextcloud-aio-nextcloud' || $container->GetIdentifier() === 'nextcloud-aio-docker-socket-proxy') {
-            $this->ConnectContainerIdToNetwork($container->GetIdentifier(), $container->GetInternalPort(), 'nextcloud-aio-docker-socket-proxy-network');
-        }
+        $this->ConnectContainerIdToNetwork($container->GetIdentifier(), $container->GetInternalPort());
     }
 
     public function StopContainer(Container $container) : void {
diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index bb21000d..a971adc1 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -577,7 +577,7 @@
                         {% if is_docker_socket_proxy_enabled == true %}
                             <input type="checkbox" id="docker-socket-proxy" name="docker-socket-proxy" checked="checked"><label for="docker-socket-proxy">Docker Socket Proxy (needed for <a href="https://github.com/cloud-py-api/app_ecosystem_v2#nextcloud-application-ecosystem-v2">Nextcloud Application Ecosystem V2</a>)</label><br><br>
                         {% else %}
-                            <input type="checkbox" id="docker-socket-proxy" name="docker-socket-proxy"><label for="docker-socket-proxy">Docker Socket Proxy (needed for <a href="https://github.com/cloud-py-api/app_ecosystem_v2#nextcloud-application-ecosystem-v2">Nextcloud Application Ecosystem V2</a>)</label><br><br>
+                            {# <input type="checkbox" id="docker-socket-proxy" name="docker-socket-proxy"><label for="docker-socket-proxy">Docker Socket Proxy (needed for <a href="https://github.com/cloud-py-api/app_ecosystem_v2#nextcloud-application-ecosystem-v2">Nextcloud Application Ecosystem V2</a>)</label><br><br> #}
                         {% endif %}
                         <input id="options-form-submit" class="button" type="submit" value="Save changes" />
                         <script type="text/javascript" src="options-form-submit.js"></script>