diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d30512df5ffdfdde3a666582fc4fe462b6c33f68..3540f2faceadf72d8168c7419c08776ae7a962c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,7 @@
 variables:
   CI_REGISTRY_IMAGE_ENV: $CI_REGISTRY/fdo/fdo-manager-webui/testenv:$CI_COMMIT_REF_NAME
+  CI_REGISTRY_IMAGE_BUILD: $CI_REGISTRY/fdo/fdo-manager-webui/fdo-manager-webui:latest
+
 
 default:
   image: docker:22.06-rc
@@ -13,6 +15,7 @@ workflow:
 stages:
   - setup
   - test
+  - deploy
 
 webui:setup:
   stage: setup
@@ -28,7 +31,6 @@ webui:setup:
         - package-lock.json
         - .gitlab-ci.yml
   script:
-    - echo "registry $CI_REGISTRY"
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     - docker build --pull -t $CI_REGISTRY_IMAGE_ENV -f .test/Dockerfile .
     - docker push $CI_REGISTRY_IMAGE_ENV
@@ -47,3 +49,16 @@ webui:build-test:
   <<: *webui-job
   script:
     - npm run build
+
+webui:deploy:
+  stage: deploy
+  only:
+    - /^main$/
+  needs:
+    - job: "webui:build-test"
+  script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build --pull -t $CI_REGISTRY_IMAGE_BUILD -f Dockerfile .
+    - docker push $CI_REGISTRY_IMAGE_BUILD
+
+