diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a6012b8..9bfdeec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,3 +22,23 @@ jobs:
       - name: Build app
         run: |-
           go build -o out/GigaUserbot -ldflags="-w -s" .
+
+  docker-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: false
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: divkix/GIGA-Userbot:latest
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 87e67c3..0b526c7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,18 +1,25 @@
 version: '3.9'
 services:
   db:
-    image: postgres:latest
+    image: redis:latest
     restart: always
-    environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
+    networks:
+      - gigaub
+    volumes:
+      - giga-db-data:/data
   giga-ub:
     image: giga-ub
     restart: always
     build:
       context: .
       dockerfile: Dockerfile
-    links:
-      - db
     depends_on:
       - db
+    networks:
+      - gigaub
+
+volumes:
+  giga-db-data:
+
+networks:
+  gigaub: