diff --git a/config/common.mk b/config/common.mk
index cf9db005..613bc791 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -1,6 +1,7 @@
 PRODUCT_BRAND ?= replicant
 
--include vendor/replicant-priv/keys.mk
+-include vendor/replicant-security/security.mk
+
 SUPERUSER_EMBEDDED := true
 SUPERUSER_PACKAGE_PREFIX := com.android.settings.cyanogenmod.superuser
 
@@ -24,6 +25,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 ifneq ($(TARGET_BUILD_VARIANT),eng)
 # Enable ADB authentication
 ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1
+# Allow ADB root access
+ADDITIONAL_DEFAULT_PROPERTIES += persist.sys.root_access=3
 endif
 
 # Copy over the changelog to the device
diff --git a/targets b/targets
index 0fc0cf6c..92dbeadf 100644
--- a/targets
+++ b/targets
@@ -1,11 +1,11 @@
-replicant_crespo-eng
-replicant_galaxysmtd-eng
-replicant_i9100-eng
-replicant_n7000-eng
-replicant_maguro-eng
-replicant_p5100-eng
-replicant_p5110-eng
-replicant_p3100-eng
-replicant_p3110-eng
-replicant_i9300-eng
-replicant_n7100-eng
+replicant_crespo-userdebug
+replicant_galaxysmtd-userdebug
+replicant_i9100-userdebug
+replicant_n7000-userdebug
+replicant_maguro-userdebug
+replicant_p5100-userdebug
+replicant_p5110-userdebug
+replicant_p3100-userdebug
+replicant_p3110-userdebug
+replicant_i9300-userdebug
+replicant_n7100-userdebug