diff --git a/constants.h b/constants.h
index c4e4be6..3db267d 100644
--- a/constants.h
+++ b/constants.h
@@ -13,7 +13,7 @@
 /// Path to the main SSU configuration file
 #define SSU_REPO_CONFIGURATION "/usr/share/ssu/repos.ini"
 /// Path to board / device family mappings file
-#define SSU_BOARD_MAPPING_CONFIGURATION "/usr/share/ssu/board-mappings.ini"
+#define SSU_BOARD_MAPPING_CONFIGURATION "/var/cache/ssu/board-mappings.ini"
 /// Path to config.d for board mappings
 #define SSU_BOARD_MAPPING_CONFIGURATION_DIR "/usr/share/ssu/board-mappings.d"
 /// Directory where all the non-user modifiable data sits
diff --git a/libssu/ssufeaturemanager.cpp b/libssu/ssufeaturemanager.cpp
index 61c489f..7047b64 100644
--- a/libssu/ssufeaturemanager.cpp
+++ b/libssu/ssufeaturemanager.cpp
@@ -20,7 +20,7 @@
 
 #ifndef SSU_FEATURE_CONFIGURATION
 /// Path to the main SSU configuration file
-#define SSU_FEATURE_CONFIGURATION "/usr/share/ssu/features.ini"
+#define SSU_FEATURE_CONFIGURATION "/var/cache/ssu/features.ini"
 #endif
 
 #ifndef SSU_FEATURE_CONFIGURATION_DIR
diff --git a/rpm/ssu.spec b/rpm/ssu.spec
index 9f86706..194f70e 100644
--- a/rpm/ssu.spec
+++ b/rpm/ssu.spec
@@ -169,5 +169,13 @@ if [ "$1" == 0 ]; then
   getent group ssu >/dev/null && groupdel ssu
 fi
 
+# Removing autogenerated droplets can be dropped eventually
+# Just needed for a transition period
 %post
 /sbin/ldconfig
+if [ -f /usr/share/ssu/board-mappings.ini ]; then
+    rm -f /usr/share/ssu/board-mappings.ini
+fi
+if [ -f /usr/share/ssu/features.ini ]; then
+    rm -f /usr/share/ssu/features.ini
+fi