diff --git a/.cirrus.yml b/.cirrus.yml
index e3cfb94..9d68031 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -7,11 +7,12 @@ env:
     three: "ENCRYPTED[799a19ef34b1bd39bd174dbc5b2044e1fd4124b0bf9436ed68a3a197e68be303e15a59b4b448a4f58c44b0faa3c3892b]"
     four: "ENCRYPTED[9e0496c7d952b248073be75b1c017479eaf1e341786b6210025800b5d2f4d40b82452928bd6cc43ed1bc1065ee915363]"
 
+
 task:
   name: Test
   skip: $CIRRUS_BRANCH == 'master'
-  only_if: $CIRRUS_REPO_OWNER == 'ROM-builders'
-  timeout_in: 2m
+  only_if: $CIRRUS_REPO_OWNER == 'ismasrull'
+  timeout_in: 1m
   persistent_worker:
     labels:
       name: AX61-2
@@ -28,7 +29,7 @@ task:
 task:
   name: Build
   skip: $CIRRUS_BRANCH == 'master'
-  only_if: $CIRRUS_REPO_OWNER == 'ROM-builders'
+  only_if: $CIRRUS_REPO_OWNER == 'ismasrull'
   depends_on: Test
   timeout_in: 4h
   persistent_worker:
@@ -55,7 +56,7 @@ task:
 task:
   name: Post Build
   skip: $CIRRUS_BRANCH == 'master'
-  only_if: $CIRRUS_REPO_OWNER == 'ROM-builders'
+  only_if: $CIRRUS_REPO_OWNER == 'ismasrull'
   skip_notifications: true
   depends_on: Build
   timeout_in: 2m
diff --git a/.github/workflows/discussion-notify.yml b/.github/workflows/discussion-notify.yml
index 86ce640..9398d44 100644
--- a/.github/workflows/discussion-notify.yml
+++ b/.github/workflows/discussion-notify.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   discussion:
-    if: ${{ github.ref == 'refs/heads/main' }}
+    if: ${{ github.ref == 'refs/heads/master' }}
     runs-on: ubuntu-latest
     steps:
         - name: Checkout