diff --git a/packages/taiko-client/bindings/encoding/struct.go b/packages/taiko-client/bindings/encoding/struct.go
index 7e9dc1fed1..3cb7d65c56 100644
--- a/packages/taiko-client/bindings/encoding/struct.go
+++ b/packages/taiko-client/bindings/encoding/struct.go
@@ -14,17 +14,11 @@ import (
 var (
 	TierOptimisticID       uint16 = 100
 	TierSgxID              uint16 = 200
+	TierZkVMRisc0ID        uint16 = 290
 	TierSgxAndZkVMID       uint16 = 300
 	TierGuardianMinorityID uint16 = 900
 	TierGuardianMajorityID uint16 = 1000
-	ProtocolTiers                 = []uint16{
-		TierOptimisticID,
-		TierSgxID,
-		TierSgxAndZkVMID,
-		TierGuardianMinorityID,
-		TierGuardianMajorityID,
-	}
-	GoldenTouchPrivKey = "92954368afd3caa1f3ce3ead0069c1af414054aefe1ef9aeacc1bf426222ce38"
+	GoldenTouchPrivKey            = "92954368afd3caa1f3ce3ead0069c1af414054aefe1ef9aeacc1bf426222ce38"
 )
 
 // HookCall should be same with TaikoData.HookCall
diff --git a/packages/taiko-client/prover/init.go b/packages/taiko-client/prover/init.go
index fd9ff00927..c9961bf122 100644
--- a/packages/taiko-client/prover/init.go
+++ b/packages/taiko-client/prover/init.go
@@ -114,7 +114,8 @@ func (p *Prover) initProofSubmitters(
 				Dummy:               p.cfg.Dummy,
 				RaikoRequestTimeout: p.cfg.RaikoRequestTimeout,
 			}
-		case encoding.TierSgxAndZkVMID:
+		case encoding.TierZkVMRisc0ID:
+			// TODO: Temporarily use SgxAndZKvmProofProducer to generate zkvm proofs
 			producer = &proofProducer.SgxAndZKvmProofProducer{
 				ZKProofType: proofProducer.ZKProofTypeR0,
 				SGX: proofProducer.SGXProofProducer{
diff --git a/packages/taiko-client/prover/proof_producer/sgx_and_zkvm_producer.go b/packages/taiko-client/prover/proof_producer/sgx_and_zkvm_producer.go
index 0af15b229e..10fbbffb80 100644
--- a/packages/taiko-client/prover/proof_producer/sgx_and_zkvm_producer.go
+++ b/packages/taiko-client/prover/proof_producer/sgx_and_zkvm_producer.go
@@ -243,5 +243,6 @@ func (s *SgxAndZKvmProofProducer) requestCancel(
 
 // Tier implements the ProofProducer interface.
 func (s *SgxAndZKvmProofProducer) Tier() uint16 {
-	return encoding.TierSgxAndZkVMID
+	// TODO: Temporarily use TierZkVMRisc0ID instead of TierSgxAndZkVMID
+	return encoding.TierZkVMRisc0ID
 }
diff --git a/packages/taiko-client/prover/proof_submitter/proof_submitter.go b/packages/taiko-client/prover/proof_submitter/proof_submitter.go
index 3765e52134..98e5d9d15d 100644
--- a/packages/taiko-client/prover/proof_submitter/proof_submitter.go
+++ b/packages/taiko-client/prover/proof_submitter/proof_submitter.go
@@ -28,7 +28,7 @@ var (
 	_                              Submitter = (*ProofSubmitter)(nil)
 	submissionDelayRandomBumpRange float64   = 20
 	proofPollingInterval                     = 10 * time.Second
-	ProofTimeout                             = 90 * time.Minute
+	ProofTimeout                             = 3 * time.Hour
 )
 
 // ProofSubmitter is responsible requesting proofs for the given L2