diff --git a/.circleci/config.yml b/.circleci/config.yml
index 86c7ef3..50622e4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,13 +38,16 @@ jobs:
           yarn run compile-contracts
           yarn run tests
   publish:
+    environment:
+      IMAGE_NAME: ghcr.io/shutter-network/keyper-payer
     docker:
       - image: cimg/base:2023.12
     steps:
       - checkout
-      - run: DOCKER_BUILDKIT=1 docker build -t keyper-payer:$(shell git describe --tags) -t keyper-payer:sha-$(shell git rev-parse HEAD) .
+      - setup_remote_docker
+      - run: DOCKER_BUILDKIT=1 docker build -t ${IMAGE_NAME}:sha-$(git rev-parse HEAD) .
       - run: echo ${GHCR_PAT} | docker login -u bilbeyt --password-stdin ghcr.io
-      - run: docker push -a keyper-payer
+      - run: docker push -a ${IMAGE_NAME}
 
 workflows:
   app:
@@ -52,10 +55,8 @@ workflows:
       - lint
       - test
       - publish:
-          filters:
-            branches:
-              only: main
-            tags:
-              only: /.*/
+          requires:
+            - lint
+            - test