diff --git a/manifest.xml b/manifest.xml
index 221459cc..efe87259 100755
--- a/manifest.xml
+++ b/manifest.xml
@@ -146,7 +146,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <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/sdm660.mk b/sdm660.mk
index bbddff1c..e98941cf 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -40,7 +40,7 @@ COMMON_PATH := device/xiaomi/sdm660-common
 # Inherit properties
 $(call inherit-product, $(COMMON_PATH)/properties.mk)
 
-# Shims 
+# Shims
 PRODUCT_PACKAGES += \
     camera.sdm660_shim
 
@@ -214,7 +214,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator@2.0-impl:64 \
     android.hardware.graphics.allocator@2.0-service \
-    android.hardware.graphics.mapper@2.0-impl \
+    android.hardware.graphics.mapper@2.0-impl-2.1 \
     android.hardware.graphics.composer@2.1-impl:64 \
     android.hardware.graphics.composer@2.1-service \
     android.hardware.memtrack@1.0-impl \