diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0cba76..ce4666f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,8 @@ stages:
 
 build:
   stage: build
+  rules:
+    - when: always
   artifacts:
     paths:
       - ./dist
@@ -16,13 +18,17 @@ build:
 
 test:
   stage: test
+  rules:
+    - when: always
   script:
     - echo "Haha no tests yet"
 
 deploy:
   stage: deploy
-  only:
-    - master
-    - merge_requests
+  rules:
+      # only run on MRs to main
+    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"
+    # run on commits to main
+    - if: $CI_COMMIT_BRANCH == "main"
   script:
     - TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python -m twine upload --repository-url ${CI_API_V4_URL}/projects/${PACKAGE_PROJECT_ID}/packages/pypi dist/*