diff --git a/roles/yacht/defaults/main.yml b/roles/yacht/defaults/main.yml
index b43eb20383..f764bb31a0 100644
--- a/roles/yacht/defaults/main.yml
+++ b/roles/yacht/defaults/main.yml
@@ -7,6 +7,14 @@
 #                   GNU General Public License v3.0                      #
 ##########################################################################
 ---
+################################
+# Docker Socket Proxy
+################################
+
+yacht_docker_socket_proxy_envs:
+  CONTAINERS: "1"
+  POST: "0"
+
 ################################
 # Basics
 ################################
@@ -80,6 +88,7 @@ yacht_docker_envs_default:
   PGID: "{{ gid }}"
   ADMIN_EMAIL: "{{ user.email }}"
   SECRET_KEY: "{{ lookup('password', '/dev/null chars=ascii_lowercase,digits length=16') }}"
+  DOCKER_HOST: "tcp://{{ yacht_name }}-docker-socket-proxy:2375"
 yacht_docker_envs_custom: {}
 yacht_docker_envs: "{{ yacht_docker_envs_default
                        | combine(yacht_docker_envs_custom) }}"
@@ -92,7 +101,6 @@ yacht_docker_commands: "{{ yacht_docker_commands_default
 
 # Volumes
 yacht_docker_volumes_default:
-  - "/var/run/docker.sock:/var/run/docker.sock"
   - "{{ yacht_paths_location }}/config:/config"
   - "{{ yacht_paths_location }}/storage:/storage"
 yacht_docker_volumes_custom: []
diff --git a/roles/yacht/tasks/main.yml b/roles/yacht/tasks/main.yml
index 15ebf66cc1..6e1814bd56 100644
--- a/roles/yacht/tasks/main.yml
+++ b/roles/yacht/tasks/main.yml
@@ -7,6 +7,13 @@
 #                   GNU General Public License v3.0                     #
 #########################################################################
 ---
+- name: Docker Socket Proxy Role
+  ansible.builtin.include_role:
+    name: docker_socket_proxy
+  vars:
+    docker_socket_proxy_name: "{{ yacht_name }}-docker-socket-proxy"
+    docker_socket_proxy_docker_envs: "{{ yacht_docker_socket_proxy_envs }}"
+
 - name: Add DNS record
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"
   vars: