diff --git a/core/configuration-store.lib b/core/configuration-store.lib
index e578b2692d..c58745a2e2 100644
--- a/core/configuration-store.lib
+++ b/core/configuration-store.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/configuration-store/#d5b22e9e6ea6a9dfd50195aa03258139324e3106
+https://github.com/ARMmbed/configuration-store/#0dce9691d686b78abc4ed74f50b7b1d186cedf46
\ No newline at end of file
diff --git a/core/flash-abstraction.lib b/core/flash-abstraction.lib
index b787461c2b..68a98fa28b 100644
--- a/core/flash-abstraction.lib
+++ b/core/flash-abstraction.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/flash-abstraction/#98261585a4a1b05c64419b83088fcd86aad667af
+https://github.com/simonqhughes/flash-abstraction/#0fd8229efd7306af40093401318d8ae9e7a979c4
\ No newline at end of file