diff --git a/.github/workflows/e2e-polybft.yml b/.github/workflows/e2e-polybft.yml
index 5e3a734025..26fbffe31c 100644
--- a/.github/workflows/e2e-polybft.yml
+++ b/.github/workflows/e2e-polybft.yml
@@ -6,6 +6,7 @@ on:  # yamllint disable-line rule:truthy
       - main
       - develop
   pull_request:
+  workflow_call:
 
 jobs:
   build:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 14f57baf5c..6edec7daee 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1,9 +1,11 @@
 ---
 name: Nightly Build
-on:
-  schedule:
-    # * is a special character in YAML so you have to quote this string
-  - cron: '0 2 * * *' # run at 2 AM UTC
+on:  # yamllint disable-line rule:truthy
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
 
 jobs:
   build:
@@ -21,8 +23,10 @@ jobs:
   e2e:
     name: E2E Tests
     uses: ./.github/workflows/e2e-polybft.yml
+    needs: build
 
   property:
     name: Property Tests
     uses: ./.github/workflows/property-polybft.yml
+    needs: build
   
\ No newline at end of file
diff --git a/.github/workflows/property-polybft.yml b/.github/workflows/property-polybft.yml
index a4fd8655be..8d21508f20 100644
--- a/.github/workflows/property-polybft.yml
+++ b/.github/workflows/property-polybft.yml
@@ -1,5 +1,11 @@
 ---
-name: PolyBFT Property based tests
+name: PolyBFT Property tests
+on:  # yamllint disable-line rule:truthy
+  push:
+    branches:
+      - main
+      - develop  
+  workflow_call:
 
 jobs:
   build:
@@ -17,8 +23,8 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: 1.18.x
-      - name: Run property tests
-        run: make test-e2e-polybft-property:
+      - name: Run tests
+        run: make test-property-polybft
       - name: Archive test logs
         if: always()
         uses: actions/upload-artifact@v3
diff --git a/Makefile b/Makefile
index ee6331de74..8ce8254e74 100644
--- a/Makefile
+++ b/Makefile
@@ -54,9 +54,9 @@ test-e2e:
 test-e2e-polybft:
     # We can not build with race because of a bug in boltdb dependency
 	go build -o artifacts/polygon-edge .
-	env EDGE_BINARY=${PWD}/artifacts/polygon-edge E2E_TESTS=true E2E_LOGS=true go test -v -timeout=30m ./e2e-polybft/e2e/...
+	env EDGE_BINARY=${PWD}/artifacts/polygon-edge E2E_TESTS=true E2E_LOGS=true E2E_TESTS_TYPE=Integration go test -v -timeout=30m ./e2e-polybft/e2e/...
 
-test-e2e-polybft-property:
+test-property-polybft:
     # We can not build with race because of a bug in boltdb dependency
 	go build -o artifacts/polygon-edge .
 	env EDGE_BINARY=${PWD}/artifacts/polygon-edge E2E_TESTS=true E2E_LOGS=true E2E_TESTS_TYPE=Property go test -v -timeout=30m ./e2e-polybft/property/...