diff --git a/VERSION b/VERSION
index 45a1b3f..781dcb0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.2
+1.1.3
diff --git a/cmd/bbsim/bbsim.go b/cmd/bbsim/bbsim.go
index 75c7263..000c836 100644
--- a/cmd/bbsim/bbsim.go
+++ b/cmd/bbsim/bbsim.go
@@ -156,6 +156,7 @@
 		"EnablePerf":           common.Config.BBSim.EnablePerf,
 		"DhcpRetry":            common.Config.BBSim.DhcpRetry,
 		"AuthRetry":            common.Config.BBSim.AuthRetry,
+		"OltRebootDelay":       common.Config.Olt.OltRebootDelay,
 	}).Info("BroadBand Simulator is on")
 
 	// control channels, they are only closed when the goroutine needs to be terminated
diff --git a/docs/source/bbsim_config.rst b/docs/source/bbsim_config.rst
index 0ddbe1e..9c4d8dc 100644
--- a/docs/source/bbsim_config.rst
+++ b/docs/source/bbsim_config.rst
@@ -10,47 +10,50 @@
 .. code:: bash
 
    $ ./bbsim --help
-   Usage of ./bbsim:
-     -api_address string
-           IP address:port
-     -authRetry
-           Set this flag if BBSim should retry EAPOL (Authentication) upon failure until success
-     -ca string
-           Set the mode for controlled activation of PON ports and ONUs
-     -config string
-           Configuration file path
-     -cpuprofile string
-           write cpu profile to file
-     -delay int
-           The delay between ONU DISCOVERY batches in milliseconds (1 ONU per each PON PORT at a time
-     -dhcpRetry
-           Set this flag if BBSim should retry DHCP upon failure until success
-     -enableEvents
-           Enable sending BBSim events on configured kafka server
-     -enableperf
-           Setting this flag will cause BBSim to not store data like traffic schedulers, flows of ONUs etc..
-     -kafkaAddress string
-           IP:Port for kafka
-     -kafkaEventTopic string
-           Ability to configure the topic on which BBSim publishes events on Kafka
-     -logCaller
-           Whether to print the caller filename or not
-     -logLevel string
-           Set the log level (trace, debug, info, warn, error)
-     -nni int
-           Number of NNI ports per OLT device to be emulated
-     -olt_id int
-           OLT device ID
-     -onu int
-           Number of ONU devices per PON port to be emulated
-     -openolt_address string
-           IP address:port
-     -pon int
-           Number of PON ports per OLT device to be emulated
-     -rest_api_address string
-           IP address:port
-     -services string
-           Service Configuration file path
+   Usage of /app/bbsim:
+      -api_address string
+            IP address:port (default ":50070")
+      -authRetry
+            Set this flag if BBSim should retry EAPOL (Authentication) upon failure until success
+      -ca string
+            Set the mode for controlled activation of PON ports and ONUs (default "default")
+      -config string
+            Configuration file path (default "configs/bbsim.yaml")
+      -cpuprofile string
+            write cpu profile to file
+      -delay int
+            The delay between ONU DISCOVERY batches in milliseconds (1 ONU per each PON PORT at a time (default 200)
+      -dhcpRetry
+            Set this flag if BBSim should retry DHCP upon failure until success
+      -enableEvents
+            Enable sending BBSim events on configured kafka server
+      -enableperf
+            Setting this flag will cause BBSim to not store data like traffic schedulers, flows of ONUs etc..
+      -kafkaAddress string
+            IP:Port for kafka (default ":9092")
+      -kafkaEventTopic string
+            Ability to configure the topic on which BBSim publishes events on Kafka
+      -logCaller
+            Whether to print the caller filename or not
+      -logLevel string
+            Set the log level (trace, debug, info, warn, error) (default "debug")
+      -nni int
+            Number of NNI ports per OLT device to be emulated (default 1)
+      -oltRebootDelay int
+            Time that BBSim should before restarting after a reboot (default 60)
+      -olt_id int
+            OLT device ID
+      -onu int
+            Number of ONU devices per PON port to be emulated (default 1)
+      -openolt_address string
+            IP address:port (default ":50060")
+      -pon int
+            Number of PON ports per OLT device to be emulated (default 1)
+      -rest_api_address string
+            IP address:port (default ":50071")
+      -services string
+            Service Configuration file path (default "configs/att-services.yaml")
+
 
 
 ``BBSim`` also looks for a configuration file in ``configs/bbsim.yaml`` from
diff --git a/internal/common/options.go b/internal/common/options.go
index 0f14eec..4ba9301 100644
--- a/internal/common/options.go
+++ b/internal/common/options.go
@@ -221,6 +221,7 @@
 	nni := flag.Int("nni", int(conf.Olt.NniPorts), "Number of NNI ports per OLT device to be emulated")
 	pon := flag.Int("pon", int(conf.Olt.PonPorts), "Number of PON ports per OLT device to be emulated")
 	onu := flag.Int("onu", int(conf.Olt.OnusPonPort), "Number of ONU devices per PON port to be emulated")
+	oltRebootDelay := flag.Int("oltRebootDelay", conf.Olt.OltRebootDelay, "Time that BBSim should before restarting after a reboot")
 
 	openolt_address := flag.String("openolt_address", conf.BBSim.OpenOltAddress, "IP address:port")
 	api_address := flag.String("api_address", conf.BBSim.ApiAddress, "IP address:port")
@@ -240,12 +241,14 @@
 	kafkaEventTopic := flag.String("kafkaEventTopic", conf.BBSim.KafkaEventTopic, "Ability to configure the topic on which BBSim publishes events on Kafka")
 	dhcpRetry := flag.Bool("dhcpRetry", conf.BBSim.DhcpRetry, "Set this flag if BBSim should retry DHCP upon failure until success")
 	authRetry := flag.Bool("authRetry", conf.BBSim.AuthRetry, "Set this flag if BBSim should retry EAPOL (Authentication) upon failure until success")
+
 	flag.Parse()
 
 	conf.Olt.ID = int(*olt_id)
 	conf.Olt.NniPorts = uint32(*nni)
 	conf.Olt.PonPorts = uint32(*pon)
 	conf.Olt.OnusPonPort = uint32(*onu)
+	conf.Olt.OltRebootDelay = *oltRebootDelay
 	conf.BBSim.ConfigFile = *configFile
 	conf.BBSim.ServiceConfigFile = *servicesFile
 	conf.BBSim.CpuProfile = profileCpu
@@ -306,7 +309,7 @@
 			OnusPonPort:        1,
 			Technology:         "XGS-PON",
 			ID:                 0,
-			OltRebootDelay:     10,
+			OltRebootDelay:     60,
 			PortStatsInterval:  20,
 		},
 		BBRConfig{