diff --git a/Corona-Warn-App/src/main/assets/technical_de.html b/Corona-Warn-App/src/main/assets/technical_de.html
index c912907b9760c719b9268a74481d2f1f1cff8340..b7a68c45bcc8866ad41385a936c09c902c643f85 100644
--- a/Corona-Warn-App/src/main/assets/technical_de.html
+++ b/Corona-Warn-App/src/main/assets/technical_de.html
@@ -38,10 +38,6 @@
     Licensor: Xtreme Labs, Pivotal Labs and Google Inc.
     Website: https://robolectric.org/
     License: MIT</p>
-<p>Component: RootBeer
-    Licensor: Scott Alexander-Bown, Mat Rollings
-    Website: https://github.com/scottyab/rootbeer
-    License: Apache 2.0</p>
 <p>Component: Zxing
     Licensor: zxing
     Website: https://github.com/zxing/zxing/
@@ -78,6 +74,10 @@
     Licensor: Google
     Website: https://github.com/google/protobuf-gradle-plugin
     License: BSD 3-Clause</p>
+<p>Component: Conscrypt
+    Licensor: Conscrypt
+    Website: https://github.com/google/conscrypt
+    License: Apache 2.0</p>
 <p>Copyright (c) 2008-2020 Zetetic LLC
     All rights reserved.</p>
 <p>Redistribution and use in source and binary forms, with or without
diff --git a/Corona-Warn-App/src/main/assets/technical_en.html b/Corona-Warn-App/src/main/assets/technical_en.html
index c912907b9760c719b9268a74481d2f1f1cff8340..b7a68c45bcc8866ad41385a936c09c902c643f85 100644
--- a/Corona-Warn-App/src/main/assets/technical_en.html
+++ b/Corona-Warn-App/src/main/assets/technical_en.html
@@ -38,10 +38,6 @@
     Licensor: Xtreme Labs, Pivotal Labs and Google Inc.
     Website: https://robolectric.org/
     License: MIT</p>
-<p>Component: RootBeer
-    Licensor: Scott Alexander-Bown, Mat Rollings
-    Website: https://github.com/scottyab/rootbeer
-    License: Apache 2.0</p>
 <p>Component: Zxing
     Licensor: zxing
     Website: https://github.com/zxing/zxing/
@@ -78,6 +74,10 @@
     Licensor: Google
     Website: https://github.com/google/protobuf-gradle-plugin
     License: BSD 3-Clause</p>
+<p>Component: Conscrypt
+    Licensor: Conscrypt
+    Website: https://github.com/google/conscrypt
+    License: Apache 2.0</p>
 <p>Copyright (c) 2008-2020 Zetetic LLC
     All rights reserved.</p>
 <p>Redistribution and use in source and binary forms, with or without
diff --git a/THIRD-PARTY-NOTICES b/THIRD-PARTY-NOTICES
index bf493454e215999c8312fd4237aa278ba3f966e0..43ece18c0961f15b59bca1f87befd4c7ca4defa0 100644
--- a/THIRD-PARTY-NOTICES
+++ b/THIRD-PARTY-NOTICES
@@ -50,11 +50,6 @@ Licensor: Xtreme Labs, Pivotal Labs and Google Inc.
 Website: http://robolectric.org/
 License: MIT
 
-Component: RootBeer
-Licensor: Scott Alexander-Bown, Mat Rollings
-Website: https://github.com/scottyab/rootbeer
-License: Apache 2.0
-
 Component: Zxing
 Licensor: zxing
 Website: https://github.com/zxing/zxing/
@@ -110,6 +105,11 @@ Licensor: Jake Wharton
 Website: https://github.com/JakeWharton/timber/
 License: Apache 2.0
 
+Component: Conscrypt
+Licensor: Conscrypt
+Website: https://github.com/google/conscrypt
+License: Apache 2.0
+
 --------------------------------------------------------------------------------
 Copyright (c) 2008-2020 Zetetic LLC
 All rights reserved.