diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 89b5253b3..84980b679 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -469,7 +469,7 @@ devture_systemd_service_manager_services_list_auto: |
     +
     ([{'name': (matrix_static_files_identifier + '.service'), 'priority': 4000, 'groups': ['matrix', 'matrix-static-files']}] if matrix_static_files_enabled else [])
     +
-    ([{'name': (devture_container_socket_proxy_identifier + '.service'), 'priority': 200, 'groups': ['matrix', 'reverse-proxies', 'container-socket-proxy']}] if devture_container_socket_proxy_enabled else [])
+    ([{'name': (container_socket_proxy_identifier + '.service'), 'priority': 200, 'groups': ['matrix', 'reverse-proxies', 'container-socket-proxy']}] if container_socket_proxy_enabled else [])
     +
     ([{'name': (traefik_identifier + '.service'), 'priority': 250, 'groups': ['matrix', 'traefik', 'reverse-proxies']}] if traefik_enabled else [])
     +
@@ -6018,25 +6018,25 @@ matrix_static_files_self_check_hostname_identity: "{{ matrix_domain }}"
 
 ########################################################################
 #                                                                      #
-# com.devture.ansible.role.container_socket_proxy                      #
+# container-socket-proxy                                               #
 #                                                                      #
 ########################################################################
 
-devture_container_socket_proxy_enabled: "{{ matrix_playbook_reverse_proxy_type == 'playbook-managed-traefik' }}"
+container_socket_proxy_enabled: "{{ matrix_playbook_reverse_proxy_type == 'playbook-managed-traefik' }}"
 
-devture_container_socket_proxy_identifier: matrix-container-socket-proxy
+container_socket_proxy_identifier: matrix-container-socket-proxy
 
-devture_container_socket_proxy_base_path: "{{ matrix_base_data_path }}/container-socket-proxy"
+container_socket_proxy_base_path: "{{ matrix_base_data_path }}/container-socket-proxy"
 
-devture_container_socket_proxy_uid: "{{ matrix_user_uid }}"
-devture_container_socket_proxy_gid: "{{ matrix_user_gid }}"
+container_socket_proxy_uid: "{{ matrix_user_uid }}"
+container_socket_proxy_gid: "{{ matrix_user_gid }}"
 
 # Traefik requires read access to the containers APIs to do its job
-devture_container_socket_proxy_api_containers_enabled: true
+container_socket_proxy_api_containers_enabled: true
 
 ########################################################################
 #                                                                      #
-# /com.devture.ansible.role.container_socket_proxy                     #
+# /container-socket-proxy                                              #
 #                                                                      #
 ########################################################################
 
@@ -6067,18 +6067,18 @@ traefik_additional_entrypoints_auto: |
     ([matrix_playbook_internal_matrix_client_api_traefik_entrypoint_definition] if matrix_playbook_internal_matrix_client_api_traefik_entrypoint_enabled else [])
   }}
 
-traefik_config_providers_docker_endpoint: "{{ devture_container_socket_proxy_endpoint if devture_container_socket_proxy_enabled else 'unix:///var/run/docker.sock' }}"
+traefik_config_providers_docker_endpoint: "{{ container_socket_proxy_endpoint if container_socket_proxy_enabled else 'unix:///var/run/docker.sock' }}"
 
 traefik_container_additional_networks_auto: |
   {{
-    ([devture_container_socket_proxy_container_network] if devture_container_socket_proxy_enabled else [])
+    ([container_socket_proxy_container_network] if container_socket_proxy_enabled else [])
   }}
 
 traefik_systemd_required_services_list: |
   {{
     ([devture_systemd_docker_base_docker_service_name])
     +
-    ([devture_container_socket_proxy_identifier + '.service'] if devture_container_socket_proxy_enabled else [])
+    ([container_socket_proxy_identifier + '.service'] if container_socket_proxy_enabled else [])
   }}
 
 ########################################################################
diff --git a/requirements.yml b/requirements.yml
index d0d4d89f0..8ae45744f 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -6,8 +6,8 @@
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-backup_borg.git
   version: v1.4.0-1.9.10-2
   name: backup_borg
-- src: git+https://github.com/devture/com.devture.ansible.role.container_socket_proxy.git
-  version: v0.2.0-0
+- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-container-socket-proxy.git
+  version: v0.3.0-0
   name: container_socket_proxy
 - src: git+https://github.com/geerlingguy/ansible-role-docker
   version: 7.4.5
diff --git a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
index 272011c88..37b8669f8 100644
--- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
+++ b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
@@ -453,6 +453,17 @@
       The following variables in your configuration need to be renamed: {{ vars | dict2items | selectattr('key', 'match', 'devture_traefik_.*') | map (attribute='key') | join(', ') }}
   when: "vars | dict2items | selectattr('key', 'match', 'devture_traefik_.*') | list | items2dict"
 
+- name: (Deprecation) Catch and report devture_container_socket_proxy variables
+  ansible.builtin.fail:
+    msg: |-
+      The container-socket-proxy role in the playbook now lives under the MASH organization (https://github.com/mother-of-all-self-hosting/ansible-role-container-socket-proxy).
+      The new role is pretty much the same, but uses differently named variables.
+
+      Please change your configuration (vars.yml) to rename all `devture_container_socket_proxy_`-prefixed variables (`devture_container_socket_proxy_*` -> `container_socket_proxy_*`).
+
+      The following variables in your configuration need to be renamed: {{ vars | dict2items | selectattr('key', 'match', 'devture_container_socket_proxy_.*') | map (attribute='key') | join(', ') }}
+  when: "vars | dict2items | selectattr('key', 'match', 'devture_container_socket_proxy_.*') | list | items2dict"
+
 - name: (Deprecation) Catch and report mautrix-hangouts variables
   ansible.builtin.fail:
     msg: |-