diff --git a/source/deployment/deployment-peer/src/main/resources/config/init/bftsmart.config b/source/deployment/deployment-peer/src/main/resources/config/init/bftsmart.config
index b5bfa5a3..4f876ef1 100644
--- a/source/deployment/deployment-peer/src/main/resources/config/init/bftsmart.config
+++ b/source/deployment/deployment-peer/src/main/resources/config/init/bftsmart.config
@@ -96,7 +96,7 @@ system.communication.outQueueSize = 500000
 system.communication.useSignatures = 0
 
 #Set to 1 if SMaRt should use MAC's, set to 0 if otherwise
-system.communication.useMACs = 1
+system.communication.useMACs = 0
 
 #Set to 1 if SMaRt should use the standard output to display debug messages, set to 0 if otherwise
 system.debug = 0
@@ -112,13 +112,13 @@ system.shutdownhook = true
 system.totalordermulticast.state_transfer = true
 
 #Maximum ahead-of-time message not discarded
-system.totalordermulticast.highMark = 10000
+system.totalordermulticast.highMark = 50
 
 #Maximum ahead-of-time message not discarded when the replica is still on EID 0 (after which the state transfer is triggered)
 system.totalordermulticast.revival_highMark = 10
 
 #Number of ahead-of-time messages necessary to trigger the state transfer after a request timeout occurs
-system.totalordermulticast.timeout_highMark = 200
+system.totalordermulticast.timeout_highMark = 100
 
 ############################################
 ###### Log and Checkpoint Configurations ###
diff --git a/source/manager/manager-service/src/main/resources/bftsmart.default.config b/source/manager/manager-service/src/main/resources/bftsmart.default.config
index c640de83..802ab94f 100644
--- a/source/manager/manager-service/src/main/resources/bftsmart.default.config
+++ b/source/manager/manager-service/src/main/resources/bftsmart.default.config
@@ -41,7 +41,6 @@ system.servers.f = 1
 #Timeout to asking for a client request
 system.totalordermulticast.timeout = 60000
 
-
 #Maximum batch size (in number of messages)
 system.totalordermulticast.maxbatchsize = 2000
 
@@ -63,7 +62,7 @@ system.communication.outQueueSize = 500000
 system.communication.useSignatures = 0
 
 #Set to 1 if SMaRt should use MAC's, set to 0 if otherwise
-system.communication.useMACs = 1
+system.communication.useMACs = 0
 
 #Set to 1 if SMaRt should use the standard output to display debug messages, set to 0 if otherwise
 system.debug = 0
@@ -79,13 +78,13 @@ system.shutdownhook = true
 system.totalordermulticast.state_transfer = true
 
 #Maximum ahead-of-time message not discarded
-system.totalordermulticast.highMark = 10000
+system.totalordermulticast.highMark = 50
 
 #Maximum ahead-of-time message not discarded when the replica is still on EID 0 (after which the state transfer is triggered)
 system.totalordermulticast.revival_highMark = 10
 
 #Number of ahead-of-time messages necessary to trigger the state transfer after a request timeout occurs
-system.totalordermulticast.timeout_highMark = 200
+system.totalordermulticast.timeout_highMark = 100
 
 ############################################
 ###### Log and Checkpoint Configurations ###