diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 8960a48..1dc9795 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Prepare image tags
         id: image-tags
         run: |
-          base=ngoduykhanh/wireguard-ui
+          base=yaestray/wireguard-ui
           app_version=dev
 
           ## Set git tag as image tag
diff --git a/examples/docker-compose/boringtun.yml b/examples/docker-compose/boringtun.yml
index a1bdd2f..b33dfb5 100644
--- a/examples/docker-compose/boringtun.yml
+++ b/examples/docker-compose/boringtun.yml
@@ -15,7 +15,7 @@ services:
       - ./config:/etc/wireguard
 
   wireguard-ui:
-    image: ngoduykhanh/wireguard-ui:latest
+    image: yaestray/wireguard-ui:latest
     container_name: wireguard-ui
     cap_add:
       - NET_ADMIN
diff --git a/examples/docker-compose/linuxserver.yml b/examples/docker-compose/linuxserver.yml
index 1b7a66f..c3010a8 100644
--- a/examples/docker-compose/linuxserver.yml
+++ b/examples/docker-compose/linuxserver.yml
@@ -15,7 +15,7 @@ services:
       - "51820:51820/udp"
 
   wireguard-ui:
-    image: ngoduykhanh/wireguard-ui:latest
+    image: yaestray/wireguard-ui:latest
     container_name: wireguard-ui
     depends_on:
       - wireguard
diff --git a/examples/docker-compose/system.yml b/examples/docker-compose/system.yml
index c27f31e..c52da9c 100644
--- a/examples/docker-compose/system.yml
+++ b/examples/docker-compose/system.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   wireguard-ui:
-    image: ngoduykhanh/wireguard-ui:latest
+    image: yaestray/wireguard-ui:latest
     container_name: wireguard-ui
     cap_add:
       - NET_ADMIN