diff --git a/.github/workflows/kub-deploy.yml b/.github/workflows/kub-deploy.yml
index 965e695..1e49f46 100644
--- a/.github/workflows/kub-deploy.yml
+++ b/.github/workflows/kub-deploy.yml
@@ -5,44 +5,52 @@ on:
     branches:
       - kub-stage
 
-env:
-  REGISTRY: 194.5.195.53:30080
-  IMAGE_NAME: admin/frontoffice-bff
-
 jobs:
-  build-and-deploy:
+  build-and-push:
     runs-on: ubuntu-latest
     container:
-      image: docker:latest
+      image: catthehacker/ubuntu:act-latest
       options: --privileged
-      env:
-        HTTP_PROXY: http://proxyuser:87zH26nbqT2@46.249.98.211:3128
-        HTTPS_PROXY: http://proxyuser:87zH26nbqT2@46.249.98.211:3128
-        NO_PROXY: localhost,127.0.0.1,gitea-svc,194.5.195.53,10.0.0.0/8
-
+    
+    services:
+      dind:
+        image: docker:27-dind
+        options: --privileged
+        env:
+          DOCKER_TLS_CERTDIR: ""
+          HTTP_PROXY: "http://proxyuser:87zH26nbqT2@46.249.98.211:3128"
+          HTTPS_PROXY: "http://proxyuser:87zH26nbqT2@46.249.98.211:3128"
+          NO_PROXY: "localhost,127.0.0.1,gitea-svc,194.5.195.53"
+    
+    env:
+      DOCKER_HOST: tcp://dind:2375
+      HTTP_PROXY: "http://proxyuser:87zH26nbqT2@46.249.98.211:3128"
+      HTTPS_PROXY: "http://proxyuser:87zH26nbqT2@46.249.98.211:3128"
+      NO_PROXY: "localhost,127.0.0.1,dind,gitea-svc,194.5.195.53"
+    
     steps:
-      - name: Install git
-        run: apk add --no-cache git
-
-      - name: Clone repository
-        run: git clone --depth 1 --branch kub-stage http://gitea-svc:3000/admin/FrontOffice.BFF.git .
-
-      - name: Start Docker daemon
+      - uses: actions/checkout@v4
+      
+      - name: Wait for Docker
         run: |
-          mkdir -p /etc/docker
-          echo '{"insecure-registries": ["194.5.195.53:30080"]}' > /etc/docker/daemon.json
-          dockerd &
-          for i in $(seq 1 30); do docker info >/dev/null 2>&1 && break || sleep 2; done
-
-      - name: Build Docker Image
+          for i in {1..30}; do
+            if docker info >/dev/null 2>&1; then
+              echo "Docker is ready"
+              exit 0
+            fi
+            echo "Waiting for Docker... ($i/30)"
+            sleep 2
+          done
+          exit 1
+      
+      - name: Build image
         run: |
-          docker build -t $REGISTRY/$IMAGE_NAME:${{ github.sha }} \
-                       -t $REGISTRY/$IMAGE_NAME:latest \
-                       --build-arg HTTP_PROXY=$HTTP_PROXY \
-                       --build-arg HTTPS_PROXY=$HTTPS_PROXY .
-
-      - name: Push to Registry
+          docker build -t 194.5.195.53:30080/admin/frontoffice-bff:latest .
+      
+      - name: Login to registry
         run: |
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login $REGISTRY -u admin --password-stdin
-          docker push $REGISTRY/$IMAGE_NAME:${{ github.sha }}
-          docker push $REGISTRY/$IMAGE_NAME:latest
+          echo "${{ secrets.REGISTRY_PASSWORD }}" | \
+          docker login 194.5.195.53:30080 -u admin --password-stdin
+      
+      - name: Push image
+        run: docker push 194.5.195.53:30080/admin/frontoffice-bff:latest