diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index 2dfe081..40cc92f 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -12,38 +12,53 @@ steps:
       - pip install -r requirements.txt pytest
       - python3 -m pytest --junit-xml=pytest_junit.xml
 
-  - name: build
-    image: docker:dind
-    privileged: true
+  - name: build-and-push
+    image: marcin00.azurecr.io/azure-cli-docker:slim-bookworm
     environment:
-      ACR_USERNAME: marcin00
-      ACR_PASSWORD:
-        from_secret: acr_password
+      ACR_NAME: marcin00
+      CLIENT_ID: c302726f-fafb-4143-94c1-67a70975574a
+      DOCKER_IMAGE: marcin00.azurecr.io/user-microservice:${CI_COMMIT_SHA}
     commands:
-      - dockerd-entrypoint.sh &
-      - sleep 10  # czas na uruchomienie usługi Docker
+      - docker build -t ${DOCKER_IMAGE} --build-arg APP_VERSION=${CI_COMMIT_SHA} --build-arg BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") .
+      - az login --identity --client-id ${CLIENT_ID}
+      - az acr login --name ${ACR_NAME}
+      - docker push ${DOCKER_IMAGE}
+
+  - name: gitops-commit
+    image: alpine/git
+    environment:
+      DEPLOY_REPO: ssh://git@srv22.mikr.us:20343/pikram/user-microservice-deploy.git
+      GITEA_DEPLOY_KEY:
+        from_secret: gitea-deploy-key
+      GITEA_KNOWN_HOST:
+        from_secret: gitea-known-host
+    commands:
+      - mkdir -p ~/.ssh
+
+      - echo "${GITEA_KNOWN_HOST}" >> ~/.ssh/known_hosts
+      - chmod 644 ~/.ssh/known_hosts
+
+      - echo "${GITEA_DEPLOY_KEY}" > ~/.ssh/id_rsa
+      - chmod 600 ~/.ssh/id_rsa
+
+      - git config --global user.name "woodpecker[bot]"
+      - git config --global user.email "woodpecker@marcin00.pl"
+
+      - git clone "${DEPLOY_REPO}" --branch woodpecker-deploy
+      - cd user-microservice-deploy
       
-      - DOCKER_IMAGE=marcin00.azurecr.io/user-microservice:$CI_COMMIT_SHA
-
-      - echo "===> Building Docker image"
-      - docker build -t $DOCKER_IMAGE .
-
-      - echo "===> Installing bash"
-      - apk add --no-cache bash
-
-      - echo "===> Installing goss"
-      - wget https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -O goss
-      - wget https://github.com/aelsabbahy/goss/releases/latest/download/dgoss -O dgoss
-      - chmod +x *goss
-
-      - echo "===> Starting container for test"
-      - export GOSS_OPTS="-f junit"
-      - export GOSS_PATH=./goss
-      - export GOSS_SLEEP=3
-      - "./dgoss run -e SQLALCHEMY_DATABASE_URI=sqlite:///:memory: $DOCKER_IMAGE > goss_junit.xml"
-
-      - echo "===> Logging in to ACR"
-      - echo "$ACR_PASSWORD" | docker login marcin00.azurecr.io -u $ACR_USERNAME --password-stdin
-
-      - echo "===> Pushing image to ACR"
-      - docker push $DOCKER_IMAGE
+      - |
+        awk -v commit="$CI_COMMIT_SHA" '
+        $0 ~ /name:[[:space:]]*api/ { in_api_container = 1; print; next }
+        in_api_container && $0 ~ /^[[:space:]]*image:[[:space:]]*/ {
+            sub(/:[^:[:space:]]+$/, ":" commit)
+            in_api_container = 0
+            print
+            next
+        }
+        { print }
+        ' deploy.yaml > deploy.tmp && mv deploy.tmp deploy.yaml
+      
+      - git add deploy.yaml
+      - 'git diff-index --quiet HEAD || git commit -m "WOODPECKER: Changed deployed version to $CI_COMMIT_SHA"'
+      - git push origin woodpecker-deploy