diff --git a/ci/deploy.yml b/ci/deploy.yml
index 412e576c9..bc312ea79 100644
--- a/ci/deploy.yml
+++ b/ci/deploy.yml
@@ -16,7 +16,7 @@ release core fw regular deploy:
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
   only:
-    - /^core\/v[0-9.]*$/
+    - /^core\//
   except:
     - branches  # run for tags only
   tags:
@@ -36,7 +36,7 @@ release core fw btconly deploy:
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
   only:
-    - /^core\/v[0-9.]*$/
+    - /^core\//
   except:
     - branches  # run for tags only
   tags:
@@ -56,7 +56,7 @@ release legacy fw regular deploy:
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
   only:
-    - /^legacy\/v[0-9.]*$/
+    - /^legacy\//
   except:
     - branches  # run for tags only
   tags:
@@ -76,7 +76,7 @@ legacy fw btconly deploy:
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
   only:
-    - /^legacy\/v[0-9.]*$/
+    - /^legacy\//
   except:
     - branches  # run for tags only
   tags:
@@ -98,7 +98,7 @@ rc core fw regular deploy:
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
   only:
-    - /^release\/[0-9]{4}-[0-9]{2}$/
+    - /^release\//
   tags:
     - deploy
 
@@ -115,7 +115,7 @@ rc core fw btconly deploy:
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
   only:
-    - /^release\/[0-9]{4}-[0-9]{2}$/
+    - /^release\//
   tags:
     - deploy
 
@@ -132,7 +132,7 @@ rc legacy fw regular deploy:
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
   only:
-    - /^release\/[0-9]{4}-[0-9]{2}$/
+    - /^release\//
   tags:
     - deploy
 
@@ -149,7 +149,7 @@ rc legacy fw btconly deploy:
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
   only:
-    - /^release\/[0-9]{4}-[0-9]{2}$/
+    - /^release\//
   tags:
     - deploy
 
@@ -169,7 +169,7 @@ upgrade tests core deploy:
     - echo "Deploying to $DEST"
     - rsync --delete -va core/build/unix/micropython "$DEST"
   only:
-    - /^core\/v[0-9.]*$/
+    - /^core\//
   except:
     - branches  # run for tags only
   tags:
@@ -189,7 +189,7 @@ upgrade tests legacy deploy:
     - echo "Deploying to $DEST"
     - rsync --delete -va legacy/firmware/trezor.elf "$DEST"
   only:
-    - /^legacy\/v[0-9.]*$/
+    - /^legacy\//
   except:
     - branches  # run for tags only
   tags:
diff --git a/ci/test.yml b/ci/test.yml
index 586b9deb3..6935d1034 100644
--- a/ci/test.yml
+++ b/ci/test.yml
@@ -326,8 +326,8 @@ hardware legacy device test:
   extends: .legacy_job
   only:
     - schedules  # nightly build
-    - /^legacy\/v[0-9.]*$/
-    - /^release\/[0-9]{4}-[0-9]{2}$/
+    - /^legacy\//
+    - /^release\//
   tags:
     - tpmb
   dependencies: