diff --git a/docker-compose.yml b/docker-compose.yml
index 96b4493..469dba6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,70 @@
 version: '3.8'
 
 services:
+    forgejo:
+        image: codeberg.org/forgejo/forgejo:9
+        container_name: forgejo
+        environment:
+            - USER_UID=1026
+            - USER_GID=100
+            - GITEA__database__DB_TYPE=sqlite3
+            - TZ=Asia/Ho_Chi_Minh
+            - GITEA__actions__ENABLED=true
+            - INSTALL_LOCK=true
+            - FORGEJO__server__ROOT_URL=https://git.khoavo.myds.me/
+            - FORGEJO__server__DOMAIN=git.khoavo.myds.me
+        restart: always
+        networks:
+            - forgejo_custom_net
+        volumes:
+            - ./forgejo-data:/data
+        ports:
+            - '3050:3000'
+            - '2222:22'
+
+    runner:
+        image: code.forgejo.org/forgejo/runner:6.0.1
+        container_name: forgejo_runner
+        restart: always
+        user: '0:0'
+        privileged: true
+        depends_on:
+            - forgejo
+        networks:
+            - forgejo_custom_net
+        volumes:
+            - /var/run/docker.sock:/var/run/docker.sock
+            - ./runner-data:/data
+        entrypoint:
+            - sh
+            - -c
+            - |
+                if [ ! -f /data/.runner ]; then
+                  forgejo-runner register --no-interactive \
+                    --instance https://git.khoavo.myds.me \
+                    --token xP3IdP05YPJJZ504z7UzK90njFFzQnX4d77cJiCN \
+                    --name synology-runner \
+                    --labels ubuntu-latest,ubuntu-22.04,docker:host
+                fi
+                forgejo-runner daemon
+        environment:
+            - TZ=Asia/Ho_Chi_Minh
+            - FORGEJO_RUNNER_ROOT_URL=https://git.khoavo.myds.me
+
     monochrome:
         image: forgejo.khoavo.myds.me/vndangkhoa/monochrome:latest
         ports:
             - '8080:4173'
         restart: unless-stopped
         volumes:
-            - ./data:/data # For local storage if needed
+            - ./monochrome-data:/data
         environment:
             - NODE_ENV=production
         pull_policy: always
+
+networks:
+    forgejo_custom_net:
+        driver: bridge
+        ipam:
+            config:
+                - subnet: 10.38.0.0/24