diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a03869..7e4b663 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,16 +3,10 @@ default:
     - universal
 
 stages:
-    - build
     - tests
+    - build and push
     - deploy
 
-build_job1:
-    stage: build
-    image: docker:latest
-    script:
-        - docker build -t quote-bot:v1 .
-
 tests_job1:
   stage: tests
   image: python:3.11-slim 
@@ -24,6 +18,22 @@ tests_job1:
   script:
     - pytest tests/
 
+build_job1:
+    stage: build and push
+    image:
+      name: gcr.io/kaniko-project/executor:v1.23.0-debug
+      entrypoint: [""]
+    before_script:
+
+    - mkdir -p /kaniko/.docker
+    - cp "$DOCKER_AUTH_CONFIG" /kaniko/.docker/config.json
+    script:
+    - /kaniko/executor
+      --context "${CI_PROJECT_DIR}"
+      --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
+      --destination "${DOCKERHUB_USER}/quote-bot:${CI_COMMIT_SHORT_SHA}" \
+      --destination "${DOCKERHUB_USER}/quote-bot:latest"
+
 deploy_to_server:
   stage: deploy
   image: ghcr.io/ansible/creator-ee:v0.22.0