diff --git a/Android.mk b/Android.mk
index fbfaf3e..8fa9cd7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,26 +6,26 @@
 
 ifeq ($(TARGET_DEVICE),beyond0lte)
 
-$(call add-radio-file-sha1-checked,radio/cm.bin_SM-G970F,f528af82d21a682876e52c64f842a1fe004188b4)
-$(call add-radio-file-sha1-checked,radio/cm.bin_SM-G970N,bc9a3f38594368080affb6b1546b02488e12cd08)
-$(call add-radio-file-sha1-checked,radio/dqmdbg.img_SM-G970F,852b89cd8b13b7ad5758cec058e0ddcdf27144eb)
-$(call add-radio-file-sha1-checked,radio/dqmdbg.img_SM-G970N,85468073397fb608bc57ed769e6eecff13e4e53c)
-$(call add-radio-file-sha1-checked,radio/keystorage.bin_SM-G970F,6ecce74dc01d82678c1756b551abc1cf59e5de8e)
-$(call add-radio-file-sha1-checked,radio/keystorage.bin_SM-G970N,899581095247329d8bc9a0dac8719ec48cd4201d)
+$(call add-radio-file-sha1-checked,radio/cm.bin_SM-G970F,d8d436fe6939555bf051885f5b9d3fe35d0475c7)
+$(call add-radio-file-sha1-checked,radio/cm.bin_SM-G970N,bb50cbeebd4a9221c4dd78264d31edb1620867ca)
+$(call add-radio-file-sha1-checked,radio/dqmdbg.img_SM-G970F,d4f25ff57c8e2d5155260d4546f6b2402e6dabdc)
+$(call add-radio-file-sha1-checked,radio/dqmdbg.img_SM-G970N,9a0965328dd745fbd1fbdfce35c07ddc5e18a808)
+$(call add-radio-file-sha1-checked,radio/keystorage.bin_SM-G970F,b095405534233a9017afe9ff34d49c3e8b1f2a2a)
+$(call add-radio-file-sha1-checked,radio/keystorage.bin_SM-G970N,4f2ee248178b72d0f7f8156bc9b8d7d18ddb7d35)
 $(call add-radio-file-sha1-checked,radio/models,3ccf54b4274f3d86e88fd21709447651ba68cef4)
-$(call add-radio-file-sha1-checked,radio/modem.bin_SM-G970F,9b99e0ef07bfbfd8eed549f25178d8090c6a9c88)
-$(call add-radio-file-sha1-checked,radio/modem.bin_SM-G970N,82acc906ea3cc31ce45e811e1ea4296dc8d331f9)
-$(call add-radio-file-sha1-checked,radio/modem_debug.bin_SM-G970F,4c834c2cdde3a16df87d1c5e08d8d989c1f7ba64)
-$(call add-radio-file-sha1-checked,radio/modem_debug.bin_SM-G970N,ab82bbd04736376f9bf8f28050ee434c91a2d740)
-$(call add-radio-file-sha1-checked,radio/param.bin_SM-G970F,d4eea2c9206286ac80ea19ae5309cb1e598b38cd)
-$(call add-radio-file-sha1-checked,radio/param.bin_SM-G970N,b4da5877429da8b4debc104981f84a1b022ad843)
-$(call add-radio-file-sha1-checked,radio/sboot.bin_SM-G970F,429a7d45a5b22d4e71311911725f68d345007a4b)
-$(call add-radio-file-sha1-checked,radio/sboot.bin_SM-G970N,3f90617560c6006698a28dd562f2dfc1ab0ef57b)
-$(call add-radio-file-sha1-checked,radio/uh.bin_SM-G970F,c760ce08a5de99d1b7a2ebd3d29b65b4609bb773)
-$(call add-radio-file-sha1-checked,radio/uh.bin_SM-G970N,b431d71a8b976fc76d76be062f663de28d2e79bb)
-$(call add-radio-file-sha1-checked,radio/up_param.bin_SM-G970F,7a314c30935fa34e67d61e24e42d4b55c5581805)
-$(call add-radio-file-sha1-checked,radio/up_param.bin_SM-G970N,dfeda461eda2bfea5ee2f9531954e1bb1b3b72c5)
-$(call add-radio-file-sha1-checked,radio/version_SM-G970F,115370c8e08fb70469c0c9adc1b38d8206114252)
-$(call add-radio-file-sha1-checked,radio/version_SM-G970N,90297cf295c482d95c8a2bb39750dca3f408697f)
+$(call add-radio-file-sha1-checked,radio/modem.bin_SM-G970F,5a66a42b03717f530762a5d211416c80ad573c65)
+$(call add-radio-file-sha1-checked,radio/modem.bin_SM-G970N,b79a2381f70ce85c440985da598a7e36fd6bd2c0)
+$(call add-radio-file-sha1-checked,radio/modem_debug.bin_SM-G970F,e4831b039e4a18e134ee36f15f8bba0931cdb20f)
+$(call add-radio-file-sha1-checked,radio/modem_debug.bin_SM-G970N,4a5fa415e3bcb006c95b54ba85aef8ab8d5b0f04)
+$(call add-radio-file-sha1-checked,radio/param.bin_SM-G970F,c97b0d210fa4a7a9c34818f7fad327c055ef3b1e)
+$(call add-radio-file-sha1-checked,radio/param.bin_SM-G970N,8bcd591976b9b22131296819ebfc2c295d1b776b)
+$(call add-radio-file-sha1-checked,radio/sboot.bin_SM-G970F,eef37c5e591d085c00d97c85c2d2e97f3424a459)
+$(call add-radio-file-sha1-checked,radio/sboot.bin_SM-G970N,06cc7993c536f9a61145a66bdeae118917b988cf)
+$(call add-radio-file-sha1-checked,radio/uh.bin_SM-G970F,dfdd1801221fe8ccea4b7d548d4895abb4be4056)
+$(call add-radio-file-sha1-checked,radio/uh.bin_SM-G970N,8bf1fb066e9c7b673906abf766d1d34e4a512a79)
+$(call add-radio-file-sha1-checked,radio/up_param.bin_SM-G970F,e1d2d00e94cacc2aa26bf7f30554ca60073ac8fe)
+$(call add-radio-file-sha1-checked,radio/up_param.bin_SM-G970N,daa206e1fa5bbbbc4952ded9c5343bdd5f86ec63)
+$(call add-radio-file-sha1-checked,radio/version_SM-G970F,382c4f98c895b8c9fba8527b9d694607a0d529ac)
+$(call add-radio-file-sha1-checked,radio/version_SM-G970N,172618abd47497984973e0164f667765b5c8d9ba)
 
 endif
diff --git a/proprietary/vendor/firmware/fimc_is_rta.bin b/proprietary/vendor/firmware/fimc_is_rta.bin
index fd2ce10..8adae43 100644
--- a/proprietary/vendor/firmware/fimc_is_rta.bin
+++ b/proprietary/vendor/firmware/fimc_is_rta.bin
Binary files differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-000000534b4d b/proprietary/vendor/tee/00000000-0000-0000-0000-000000534b4d
index f65df3f..8158a67 100644
--- a/proprietary/vendor/tee/00000000-0000-0000-0000-000000534b4d
+++ b/proprietary/vendor/tee/00000000-0000-0000-0000-000000534b4d
Binary files differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-0053545354ab b/proprietary/vendor/tee/00000000-0000-0000-0000-0053545354ab
index f916e3f..4efe1bb 100644
--- a/proprietary/vendor/tee/00000000-0000-0000-0000-0053545354ab
+++ b/proprietary/vendor/tee/00000000-0000-0000-0000-0053545354ab
Binary files differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-46494e474552 b/proprietary/vendor/tee/00000000-0000-0000-0000-46494e474552
index 5d4ab4b..b4649fb 100644
--- a/proprietary/vendor/tee/00000000-0000-0000-0000-46494e474552
+++ b/proprietary/vendor/tee/00000000-0000-0000-0000-46494e474552
Binary files differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-4b45594d5354 b/proprietary/vendor/tee/00000000-0000-0000-0000-4b45594d5354
index 790c42d..23579dd 100644
--- a/proprietary/vendor/tee/00000000-0000-0000-0000-4b45594d5354
+++ b/proprietary/vendor/tee/00000000-0000-0000-0000-4b45594d5354
Binary files differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-505256544545 b/proprietary/vendor/tee/00000000-0000-0000-0000-505256544545
index 9dd6772..dc48064 100644
--- a/proprietary/vendor/tee/00000000-0000-0000-0000-505256544545
+++ b/proprietary/vendor/tee/00000000-0000-0000-0000-505256544545
Binary files differ
diff --git a/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476 b/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476
index 8427ab1..1282280 100644
--- a/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476
+++ b/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476
Binary files differ
diff --git a/radio/cm.bin_SM-G970F b/radio/cm.bin_SM-G970F
index 5dca930..93a2ecf 100644
--- a/radio/cm.bin_SM-G970F
+++ b/radio/cm.bin_SM-G970F
Binary files differ
diff --git a/radio/cm.bin_SM-G970N b/radio/cm.bin_SM-G970N
index 8bb1b33..fe93adf 100644
--- a/radio/cm.bin_SM-G970N
+++ b/radio/cm.bin_SM-G970N
Binary files differ
diff --git a/radio/dqmdbg.img_SM-G970F b/radio/dqmdbg.img_SM-G970F
index 3d25c7d..e1f5a66 100644
--- a/radio/dqmdbg.img_SM-G970F
+++ b/radio/dqmdbg.img_SM-G970F
Binary files differ
diff --git a/radio/dqmdbg.img_SM-G970N b/radio/dqmdbg.img_SM-G970N
index 077e83b..db06cc7 100644
--- a/radio/dqmdbg.img_SM-G970N
+++ b/radio/dqmdbg.img_SM-G970N
Binary files differ
diff --git a/radio/keystorage.bin_SM-G970F b/radio/keystorage.bin_SM-G970F
index d46ff01..c1e2869 100644
--- a/radio/keystorage.bin_SM-G970F
+++ b/radio/keystorage.bin_SM-G970F
Binary files differ
diff --git a/radio/keystorage.bin_SM-G970N b/radio/keystorage.bin_SM-G970N
index 4aabde9..12761f6 100644
--- a/radio/keystorage.bin_SM-G970N
+++ b/radio/keystorage.bin_SM-G970N
Binary files differ
diff --git a/radio/modem.bin_SM-G970F b/radio/modem.bin_SM-G970F
index 08f5947..bbfa77b 100644
--- a/radio/modem.bin_SM-G970F
+++ b/radio/modem.bin_SM-G970F
Binary files differ
diff --git a/radio/modem.bin_SM-G970N b/radio/modem.bin_SM-G970N
index 4380c6a..559fd33 100644
--- a/radio/modem.bin_SM-G970N
+++ b/radio/modem.bin_SM-G970N
Binary files differ
diff --git a/radio/modem_debug.bin_SM-G970F b/radio/modem_debug.bin_SM-G970F
index 376b167..57abdac 100644
--- a/radio/modem_debug.bin_SM-G970F
+++ b/radio/modem_debug.bin_SM-G970F
Binary files differ
diff --git a/radio/modem_debug.bin_SM-G970N b/radio/modem_debug.bin_SM-G970N
index a327bf7..8cc7447 100644
--- a/radio/modem_debug.bin_SM-G970N
+++ b/radio/modem_debug.bin_SM-G970N
Binary files differ
diff --git a/radio/param.bin_SM-G970F b/radio/param.bin_SM-G970F
index 3179c3e..0ffe901 100644
--- a/radio/param.bin_SM-G970F
+++ b/radio/param.bin_SM-G970F
Binary files differ
diff --git a/radio/param.bin_SM-G970N b/radio/param.bin_SM-G970N
index a14b528..33dce5e 100644
--- a/radio/param.bin_SM-G970N
+++ b/radio/param.bin_SM-G970N
Binary files differ
diff --git a/radio/sboot.bin_SM-G970F b/radio/sboot.bin_SM-G970F
index 920a34f..a572cf4 100644
--- a/radio/sboot.bin_SM-G970F
+++ b/radio/sboot.bin_SM-G970F
Binary files differ
diff --git a/radio/sboot.bin_SM-G970N b/radio/sboot.bin_SM-G970N
index fd5c3e9..8f7e4b0 100644
--- a/radio/sboot.bin_SM-G970N
+++ b/radio/sboot.bin_SM-G970N
Binary files differ
diff --git a/radio/uh.bin_SM-G970F b/radio/uh.bin_SM-G970F
index d221842..b9f3bdf 100644
--- a/radio/uh.bin_SM-G970F
+++ b/radio/uh.bin_SM-G970F
Binary files differ
diff --git a/radio/uh.bin_SM-G970N b/radio/uh.bin_SM-G970N
index e7d7d8b..7aa1607 100644
--- a/radio/uh.bin_SM-G970N
+++ b/radio/uh.bin_SM-G970N
Binary files differ
diff --git a/radio/up_param.bin_SM-G970F b/radio/up_param.bin_SM-G970F
index a219249..190ed23 100644
--- a/radio/up_param.bin_SM-G970F
+++ b/radio/up_param.bin_SM-G970F
Binary files differ
diff --git a/radio/up_param.bin_SM-G970N b/radio/up_param.bin_SM-G970N
index f13e786..c35392a 100644
--- a/radio/up_param.bin_SM-G970N
+++ b/radio/up_param.bin_SM-G970N
Binary files differ
diff --git a/radio/version_SM-G970F b/radio/version_SM-G970F
index f71b2b2..ea2b10a 100644
--- a/radio/version_SM-G970F
+++ b/radio/version_SM-G970F
@@ -1 +1 @@
-G970FXXSGHWC1
+G970FXXSGHWC2
diff --git a/radio/version_SM-G970N b/radio/version_SM-G970N
index ed85c3b..c79f6f1 100644
--- a/radio/version_SM-G970N
+++ b/radio/version_SM-G970N
@@ -1 +1 @@
-G970NKSU7HWA1
+G970NKSU7HWD3