diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml
new file mode 100644
index 0000000..7979018
--- /dev/null
+++ b/.gitea/workflows/docker-build.yml
@@ -0,0 +1,29 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v3
+        with:
+          registry: git.pihkaal.xyz
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+
+      - name: Build and push Docker image
+        run: |
+          docker build -t git.pihkaal.xyz/pihkaal/lbf-bot:latest -f apps/discord-bot/Dockerfile .
+          docker push git.pihkaal.xyz/pihkaal/lbf-bot:latest
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
deleted file mode 100644
index 854b695..0000000
--- a/.github/workflows/docker-build.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Build and Push Docker Image
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push Docker image
-        run: |
-          docker build -t pihkaal/lbf-bot-discord-bot:latest -f apps/discord-bot/Dockerfile .
-          docker push pihkaal/lbf-bot-discord-bot:latest
diff --git a/docker-compose.yml b/docker-compose.yml
index 69ac57b..1e49c8a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,6 @@
 services:
   postgres:
+    container_name: lbf-bot-postgres
     image: postgres:17-alpine
     restart: unless-stopped
     environment:
@@ -17,6 +18,7 @@ services:
       retries: 5
 
   redis:
+    container_name: lbf-bot-redis
     image: redis:7-alpine
     restart: unless-stopped
     volumes:
@@ -25,7 +27,8 @@ services:
       - lbf-network
 
   discord-bot:
-    image: pihkaal/lbf-bot-discord-bot:latest
+    container_name: lbf-bot
+    image: git.pihkaal.xyz/pihkaal/lbf-bot:latest
     restart: unless-stopped
     depends_on:
       postgres: