diff --git a/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/.content.xml b/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/.content.xml
new file mode 100644
index 0000000..32a42cb
--- /dev/null
+++ b/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:Component"
+    jcr:title="Image - Danta"
+    sling:resourceSuperType="danta/components/section/base"
+    componentGroup="Danta AEM Demo"/>
diff --git a/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/_cq_dialog/.content.xml b/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/_cq_dialog/.content.xml
new file mode 100644
index 0000000..1663a14
--- /dev/null
+++ b/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/_cq_dialog/.content.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="Image"
+    sling:resourceType="cq/gui/components/authoring/dialog"
+    extraClientlibs="[core.wcm.components.image.v2.editor]"
+    helpPath="https://www.adobe.com/go/aem_cmp_image_v2">
+    <content
+        granite:class="cmp-image__editor"
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="granite/ui/components/coral/foundation/container">
+        <items jcr:primaryType="nt:unstructured">
+            <tabs
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="granite/ui/components/coral/foundation/tabs"
+                maximized="{Boolean}true">
+                <items jcr:primaryType="nt:unstructured">
+                    <asset
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Asset"
+                        sling:resourceType="granite/ui/components/coral/foundation/container"
+                        margin="{Boolean}true">
+                        <items jcr:primaryType="nt:unstructured">
+                            <columns
+                                jcr:primaryType="nt:unstructured"
+                                sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                                margin="{Boolean}true">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <column
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <file
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="cq/gui/components/authoring/dialog/fileupload"
+                                                autoStart="{Boolean}false"
+                                                class="cq-droptarget"
+                                                fileNameParameter="./fileName"
+                                                fileReferenceParameter="./fileReference"
+                                                mimeTypes="[image/gif,image/jpeg,image/png,image/webp,image/tiff]"
+                                                multiple="{Boolean}false"
+                                                name="./file"
+                                                title="Upload Image Asset"
+                                                uploadUrl="${suffix.path}"
+                                                useHTML5="{Boolean}true"/>
+                                        </items>
+                                    </column>
+                                </items>
+                            </columns>
+                        </items>
+                    </asset>
+                    <metadata
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Metadata"
+                        sling:resourceType="granite/ui/components/coral/foundation/container"
+                        margin="{Boolean}true">
+                        <items jcr:primaryType="nt:unstructured">
+                            <columns
+                                jcr:primaryType="nt:unstructured"
+                                sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                                margin="{Boolean}true">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <column
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <alternativeGroup
+                                                granite:class="cmp-image__editor-alt"
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/well">
+                                                <items jcr:primaryType="nt:unstructured">
+                                                    <alt
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                                        fieldDescription="Textual alternative of the meaning or function of the image, for visually impaired readers."
+                                                        fieldLabel="Alternative Text"
+                                                        name="./alt"
+                                                        required="{Boolean}true"/>
+                                                </items>
+                                            </alternativeGroup>
+                                        </items>
+                                    </column>
+                                </items>
+                            </columns>
+                        </items>
+                    </metadata>
+                </items>
+            </tabs>
+        </items>
+    </content>
+</jcr:root>
diff --git a/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/_cq_editConfig.xml b/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/_cq_editConfig.xml
new file mode 100644
index 0000000..3d51f22
--- /dev/null
+++ b/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/_cq_editConfig.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="cq:EditConfig">
+    <cq:dropTargets jcr:primaryType="nt:unstructured">
+        <image
+            jcr:primaryType="cq:DropTargetConfig"
+            accept="[image/gif,image/jpeg,image/png,image/webp,image/tiff]"
+            groups="[media]"
+            propertyName="./fileReference">
+            <parameters
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="core/wcm/components/image/v2/image"
+                imageCrop=""
+                imageMap=""
+                imageRotate=""/>
+        </image>
+    </cq:dropTargets>
+    <cq:inplaceEditing
+        jcr:primaryType="cq:InplaceEditingConfig"
+        active="{Boolean}true"
+        editorType="image">
+        <config jcr:primaryType="nt:unstructured">
+            <plugins jcr:primaryType="nt:unstructured">
+                <crop
+                    jcr:primaryType="nt:unstructured"
+                    features="*">
+                    <aspectRatios jcr:primaryType="nt:unstructured">
+                        <wideLandscape
+                            jcr:primaryType="nt:unstructured"
+                            name="Wide Landscape"
+                            ratio="0.6180"/>
+                        <landscape
+                            jcr:primaryType="nt:unstructured"
+                            name="Landscape"
+                            ratio="0.8284"/>
+                        <square
+                            jcr:primaryType="nt:unstructured"
+                            name="Square"
+                            ratio="1"/>
+                        <portrait
+                            jcr:primaryType="nt:unstructured"
+                            name="Portrait"
+                            ratio="1.6180"/>
+                    </aspectRatios>
+                </crop>
+                <flip
+                    jcr:primaryType="nt:unstructured"
+                    features="-"/>
+                <map
+                    jcr:primaryType="nt:unstructured"
+                    features="*"/>
+                <rotate
+                    jcr:primaryType="nt:unstructured"
+                    features="*"/>
+                <zoom
+                    jcr:primaryType="nt:unstructured"
+                    features="*"/>
+            </plugins>
+            <ui jcr:primaryType="nt:unstructured">
+                <inline
+                    jcr:primaryType="nt:unstructured"
+                    toolbar="[crop#launch,rotate#right,history#undo,history#redo,fullscreen#fullscreen,control#close,control#finish]">
+                    <replacementToolbars
+                        jcr:primaryType="nt:unstructured"
+                        crop="[crop#identifier,crop#unlaunch,crop#confirm]"/>
+                </inline>
+                <fullscreen jcr:primaryType="nt:unstructured">
+                    <toolbar
+                        jcr:primaryType="nt:unstructured"
+                        left="[crop#launchwithratio,rotate#right,flip#horizontal,flip#vertical,zoom#reset100,zoom#popupslider]"
+                        right="[history#undo,history#redo,fullscreen#fullscreenexit]"/>
+                    <replacementToolbars jcr:primaryType="nt:unstructured">
+                        <crop
+                            jcr:primaryType="nt:unstructured"
+                            left="[crop#identifier]"
+                            right="[crop#unlaunch,crop#confirm]"/>
+                    </replacementToolbars>
+                </fullscreen>
+            </ui>
+        </config>
+    </cq:inplaceEditing>
+</jcr:root>
diff --git a/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/component.html b/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/component.html
new file mode 100644
index 0000000..f3b2147
--- /dev/null
+++ b/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/component.html
@@ -0,0 +1,13 @@
+{%!
+* simple image component
+%}
+
+<div class="img-component img-block container" data-img="block" data-width="100%" data-align="center">
+  {%#if content.fileReference %}
+    <picture>
+      <img class="img-responsive mb-4 img-fluid" src="{% content.imagePath %}" alt="{% content.alt %}">
+    </picture>
+  {%else%}
+    image component
+  {%/if%}
+</div>
diff --git a/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/xk.config/.content.xml b/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/xk.config/.content.xml
new file mode 100644
index 0000000..63eda3e
--- /dev/null
+++ b/demoapps/src/main/content/jcr_root/apps/dantademo/components/section/image/xk.config/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="nt:unstructured"
+    xk_componentCategory="[contentImage]"
+    xk_placeholderTriggers="content.fileReference"/>