diff --git a/manifest.xml b/manifest.xml
index bd7f5c4..ada5861 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -109,7 +109,7 @@
     <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
-        <version>2.0</version>
+        <version>2.1</version>
         <interface>
             <name>IMapper</name>
             <instance>default</instance>
diff --git a/msm8996.mk b/msm8996.mk
index d2b4d74..96806a1 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -160,7 +160,7 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator@2.0-service \
     android.hardware.graphics.composer@2.1-impl \
     android.hardware.graphics.composer@2.1-service \
-    android.hardware.graphics.mapper@2.0-impl \
+    android.hardware.graphics.mapper@2.0-impl-2.1 \
     android.hardware.memtrack@1.0-impl \
     android.hardware.memtrack@1.0-service \
     vendor.display.color@1.0-impl \