diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
new file mode 100644
index 0000000..7ed486f
--- /dev/null
+++ b/roles/docker/tasks/main.yml
@@ -0,0 +1,28 @@
+---
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items: "{{ directories }}"
+
+- name: Pull latest Docker image
+  docker_image:
+    name: "{{ image.name }}"
+    tag: "{{ image.tag }}"
+    source: pull
+
+- name: Create Docker Network
+  docker_network:
+    name: "{{ network_name }}"
+  when: network_name is defined
+
+- name: Create Docker Container
+  docker_container:
+    name: "{{ name }}"
+    image: "{{ image.name }}:{{ image.tag }}"
+    recreate: true
+    restart_policy: unless-stopped
+    networks: "{{ networks }}"
+    volumes: "{{ volumes }}"
+    env: "{{ env }}"
+    labels: "{{ labels }}"
diff --git a/tasks/codeserver.yml b/tasks/codeserver.yml
index 14f72b3..1d8b5d6 100644
--- a/tasks/codeserver.yml
+++ b/tasks/codeserver.yml
@@ -1,23 +1,14 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/code-server"
-
-- name: Pull latest Code Server Docker Image
-  docker_image:
-    name: lscr.io/linuxserver/code-server
-    tag: latest
-    source: pull
-
-- name: Create Code Server Docker Container
-  docker_container:
-    name: codeserver
-    image: lscr.io/linuxserver/code-server:latest
-    restart_policy: unless-stopped
-    recreate: true
+- name: Deploy Code Server
+  include_role:
+    name: docker
+  vars:
+    name: "codeserver"
+    directories:
+      - "{{ data_dir }}/code-server"
+    image:
+      name: lscr.io/linuxserver/code-server
+      tag: latest
     networks:
       - name: homelab
     volumes: