diff --git a/roles/service/tasks/main.yaml b/roles/service/tasks/main.yaml
index 6f08632..8166656 100644
--- a/roles/service/tasks/main.yaml
+++ b/roles/service/tasks/main.yaml
@@ -23,7 +23,12 @@
   when: _service_additional_containers | length > 0
 
 - name: Native socket for {{ service_name }}
-  ansible.builtin.include_tasks: native_socket.yaml
+  ansible.builtin.include_role:
+    name: uumas.general.systemd_socket
+  vars:
+    systemd_socket_name: "{{ service_name }}"
+    systemd_socket_requires:
+      - "{{ service_name }}.service"
   when: _service_native_socket
 
 - name: Main container for {{ service_name }}
diff --git a/roles/service/tasks/native_socket.yaml b/roles/service/tasks/native_socket.yaml
deleted file mode 100644
index c9db2d0..0000000
--- a/roles/service/tasks/native_socket.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Socket for {{ service_name }}
-  ansible.builtin.template:
-    src: service.socket.j2
-    dest: /etc/systemd/system/{{ service_name }}.socket
-    mode: "0644"
-  notify:
-    - Reload systemd daemon
-    - Restart socket for {{ service_name }}
diff --git a/roles/service/templates/service.socket.j2 b/roles/service/templates/service.socket.j2
deleted file mode 100644
index 44be9d8..0000000
--- a/roles/service/templates/service.socket.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description={{ service_name }} socket
-Requires={{ service_name }}.service
-
-[Socket]
-ListenStream=/run/{{ service_name }}.sock
diff --git a/roles/socat/handlers/main.yaml b/roles/socat/handlers/main.yaml
deleted file mode 100644
index 2561e6b..0000000
--- a/roles/socat/handlers/main.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: Restart socat socket for {{ socat_service_name }}
-  ansible.builtin.set_fact:
-    systemd_restart_units: "{{ systemd_restart_units + [socat_service_name ~ '-socat.socket'] }}" # noqa: var-naming[no-role-prefix]
-  changed_when: true
-  notify: Apply systemd unit restarts
diff --git a/roles/socat/tasks/main.yaml b/roles/socat/tasks/main.yaml
index 9b4b343..9f509e5 100644
--- a/roles/socat/tasks/main.yaml
+++ b/roles/socat/tasks/main.yaml
@@ -1,12 +1,11 @@
 ---
 - name: Socat socket for {{ socat_service_name }}
-  ansible.builtin.template:
-    src: socat.socket.j2
-    dest: /etc/systemd/system/{{ socat_service_name }}-socat.socket
-    mode: "0644"
-  notify:
-    - Reload systemd daemon
-    - Restart socat socket for {{ socat_service_name }}
+  ansible.builtin.import_role:
+    name: uumas.general.systemd_socket
+  vars:
+    systemd_socket_name: "{{ socat_service_name }}-socat"
+    systemd_socket_requires:
+      - "{{ socat_target_container }}.service"
 
 - name: Socat container for {{ socat_service_name }}
   ansible.builtin.import_role:
diff --git a/roles/socat/templates/socat.socket.j2 b/roles/socat/templates/socat.socket.j2
deleted file mode 100644
index cb999fb..0000000
--- a/roles/socat/templates/socat.socket.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description={{ socat_service_name }} socat socket
-Requires={{ socat_target_container }}.service
-
-[Socket]
-ListenStream=/run/{{ socat_service_name }}-socat.sock