diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 117f0e7..55cc586 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -24,7 +24,6 @@ TARGET_CPU_VARIANT := krait
 
 # Audio
 BOARD_USES_ALSA_AUDIO := true
-TARGET_QCOM_AUDIO_VARIANT := caf
 TARGET_USES_QCOM_COMPRESSED_AUDIO := true
 
 # Bluetooth
@@ -45,7 +44,6 @@ PRODUCT_BOOT_JARS := $(subst $(space),:,$(PRODUCT_BOOT_JARS))
 
 # Display
 BOARD_EGL_CFG := device/samsung/msm8974-common/configs/egl.cfg
-TARGET_QCOM_DISPLAY_VARIANT := caf-new
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 OVERRIDE_RS_DRIVER:= libRSDriver_adreno.so
 
@@ -60,7 +58,6 @@ MAX_EGL_CACHE_KEY_SIZE := 12*1024
 MAX_EGL_CACHE_SIZE := 2048*1024
 
 # Media
-TARGET_QCOM_MEDIA_VARIANT := caf-new
 TARGET_ENABLE_QC_AV_ENHANCEMENTS := true
 
 # Qualcomm support
diff --git a/cm.dependencies b/cm.dependencies
index 933cf39..23d3caf 100644
--- a/cm.dependencies
+++ b/cm.dependencies
@@ -8,11 +8,18 @@
     "target_path": "device/samsung/qcom-common"
   },
   {
-    "repository": "android_hardware_qcom_display-caf-new",
-    "target_path": "hardware/qcom/display-caf-new"
+    "repository": "android_hardware_qcom_audio",
+    "target_path": "hardware/qcom/audio-caf/default"
+    "branch": "cm-12.0-caf-8974"
+  },
+  {
+    "repository": "android_hardware_qcom_display",
+    "target_path": "hardware/qcom/display-caf/msm8974"
+    "branch": "cm-12.0-caf-8974"
   },
   {
     "repository": "android_hardware_qcom_media-caf-new",
-    "target_path": "hardware/qcom/media-caf-new"
+    "target_path": "hardware/qcom/media-caf/msm8974"
+    "branch": "cm-12.0-caf-8974"
   }
 ]