diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml
deleted file mode 100644
index 394c807..0000000
--- a/.gitea/workflows/demo.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Gitea Actions Demo
-run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
-on: [push]
-
-jobs:
-  Explore-Gitea-Actions:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
-      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
-      - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
-      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
-      - name: List files in the repository
-        run: |
-          ls ${{ gitea.workspace }}
-      - run: echo "🍏 This job's status is ${{ job.status }}."
\ No newline at end of file
diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
new file mode 100644
index 0000000..37cc6f2
--- /dev/null
+++ b/.gitea/workflows/deploy.yaml
@@ -0,0 +1,36 @@
+name: Build and Push Docker Images
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: docker
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to local registry
+        if: ${{ secrets.REGISTRY_USER != '' }}
+        run: |
+          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 192.168.0.26:5008 -u ${{ secrets.REGISTRY_USER }} --password-stdin || true
+
+      - name: Build and Push Client
+        run: |
+          echo "🚀 Building Client..."
+          docker buildx build -t crylia/japanese-srs-trainer-wanikani-client:latest -f client/Dockerfile client
+          docker tag crylia/japanese-srs-trainer-wanikani-client:latest 192.168.0.26:5008/japanese-srs-trainer-wanikani-client:latest
+          docker push 192.168.0.26:5008/japanese-srs-trainer-wanikani-client:latest
+
+      - name: Build and Push Server
+        run: |
+          echo "🚀 Building Server..."
+          docker buildx build -t crylia/japanese-srs-trainer-wanikani-server:latest -f server/Dockerfile server
+          docker tag crylia/japanese-srs-trainer-wanikani-server:latest 192.168.0.26:5008/japanese-srs-trainer-wanikani-server:latest
+          docker push 192.168.0.26:5008/japanese-srs-trainer-wanikani-server:latest