diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 551d893..2d5d439 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -97,6 +97,7 @@ DEVICE_MATRIX_FILE := device/samsung/msm8226-common/compatibility_matrix.xml
 TARGET_KEYMASTER_SKIP_WAITING_FOR_QSEE := true
 
 # SELinux
+CONFIG_NEO_MSM_SEPOLICY_TYPE := temporary
 include device/samsung/msm8226-common/sepolicy/sepolicy.mk
 
 # Partitions
diff --git a/sepolicy/sepolicy.mk b/sepolicy/sepolicy.mk
index 6185c71..edb8b58 100644
--- a/sepolicy/sepolicy.mk
+++ b/sepolicy/sepolicy.mk
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
+ifeq($(CONFIG_NEO_MSM_SEPOLICY_TYPE), common)
 include device/qcom/sepolicy-legacy/sepolicy.mk
-
-# Board specific SELinux policy variable definitions
 BOARD_SEPOLICY_DIRS += \
     device/samsung/msm8226-common/sepolicy/common
+endif