diff --git a/cmake_targets/tools/build_hss b/cmake_targets/tools/build_hss
index 06b26a20fd0d627bec2a02d1ebcf38ddb4a6e7c3..32cc762d0b2a8003bd6c585ba4a2d3875c05a579 100755
--- a/cmake_targets/tools/build_hss
+++ b/cmake_targets/tools/build_hss
@@ -57,13 +57,10 @@ function help()
   echo_error "  -i, --check-installed-software            Check installed software packages necessary to build and run HSS (support Ubuntu 14.04)."
   echo_error "  -I, --install-hss-files                   Install HSS database if necessary."
   echo_error "  -k, --operator-key             key        Operator key of the HSS."
-  echo_error "                                            If not specified, default is 11111111111111111111111111111111 if operator ckey is not specified also."
-  echo_error "  -K, --operator-ckey            ciph. key  Operator ciphered key of the HSS (Could be 8E27B6AF0E692E750F32667A3B14605D=OPC(11111111111111111111111111111111))."
-  echo_error "                                            ( OPC()=RijndaelEncrypt(operator-key) Xor operator-key, LTE-K (prov database) scheduled in Rijndael algo before RijndaelEncrypt)."
-  echo_error "                                            Note that you can have the RijndaelEncrypt() at http://extranet.cryptomathic.com/aescalc or"
-  echo_error "                                                                                         at http://www.hanewin.net/encrypt/aes/aes-test.htm."
+  echo_error "                                            If filled, then OPc key in table users for all subscribers (IMSI) will be computed."
   echo_error "  -m, --connect-to-mme           fqdn       MME act as a S6A server, HSS as a client (reversed situation but allows MME and HSS be on the same host) ."
   echo_error "  -r, --realm                    realm      Realm of the HSS (optional parameter)."
+  echo_error "  -R, --random                   boolean    If false HSS random function returns always 0 (allowed values: {true, false})."
   echo_error "  -s, --transport-sctp-only                 Diameter use SCTP (TCP disabled)."
   echo_error "  -t, --transport-tcp-only                  Diameter use TCP (SCTP disabled)."
   echo_error "  -T, --transport-prefer-tcp                Diameter prefer TCP."
@@ -126,11 +123,6 @@ function main()
         cmake_args="$cmake_args -DOPERATOR_key=$2"
         shift 2;
         ;;
-      -K | --operator-ckey)
-        echo "Operator ciphered key of the HSS: $2"
-        cmake_args="$cmake_args -DOPERATOR_ckey=$2"
-        shift 2;
-        ;;
       -m | --connect-to-mme)
         mme_fqdn=$2
         shift 2;
@@ -140,6 +132,11 @@ function main()
         cmake_args="$cmake_args -DREALM=$2"
         shift 2;
         ;;
+      -R | --random)
+        echo "Random function: $2"
+        cmake_args="$cmake_args -DRANDOM_boolean=$2"
+        shift 2;
+        ;;
       -s | --transport-sctp-only)
         echo "Diameter use SCTP (TCP disabled), this is the default option."
         cmake_args="$cmake_args -DTRANSPORT_option=No_TCP"