diff --git a/.github/workflows/simulation-test.yaml b/.github/workflows/simulation-test.yaml
index 4cbef0a10b..901a63039e 100644
--- a/.github/workflows/simulation-test.yaml
+++ b/.github/workflows/simulation-test.yaml
@@ -4,15 +4,14 @@ on:
   # The workflow runs when code is pushed to either the main or develop branches
   push:
     branches:
-      - sim-import-export
-#      - main
-#      - develop
-#  # The workflow runs when a pull request is opened or updated
-#  pull_request:
-#  # Run daily at 6AM UTC Daily
-#  schedule:
-#    - cron: "0 6 * * *"
-#  # It can be run manually targetting a specific test
+      - main
+      - develop
+  # The workflow runs when a pull request is opened or updated
+  pull_request:
+  # Run daily at 6AM UTC Daily
+  schedule:
+    - cron: "0 6 * * *"
+  # It can be run manually targetting a specific test
   workflow_dispatch:
     inputs:
       test-target:
diff --git a/Makefile b/Makefile
index e37fd14305..d052005c4c 100644
--- a/Makefile
+++ b/Makefile
@@ -387,16 +387,16 @@ define run-sim-test
 endef
 
 test-sim-nondeterminism:
-	$(call run-sim-test,"non-determinism test",TestAppStateDeterminism,10,20,2h)
+	$(call run-sim-test,"non-determinism test",TestAppStateDeterminism,100,200,30m)
 
 test-sim-fullappsimulation:
-	$(call run-sim-test,"TestFullAppSimulation",TestFullAppSimulation,100,200,2h)
+	$(call run-sim-test,"TestFullAppSimulation",TestFullAppSimulation,100,200,30m)
 
 test-sim-import-export:
-	$(call run-sim-test,"test-import-export",TestAppImportExport,10,20,2h)
+	$(call run-sim-test,"test-import-export",TestAppImportExport,100,200,30m)
 
 test-sim-after-import:
-	$(call run-sim-test,"test-sim-after-import",TestAppSimulationAfterImport,10,20,2h)
+	$(call run-sim-test,"test-sim-after-import",TestAppSimulationAfterImport,100,200,30m)
 
 test-sim-multi-seed-long: runsim
 	@echo "Running long multi-seed application simulation."