diff --git a/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java b/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
index 57136d6143bb..e20bf085afa9 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
@@ -438,10 +438,11 @@ public void reserveDOI(Context context, DSpaceObject dso, String doi)
                 return;
             }
             // 400 -> invalid XML
+	    case (422):
             case (400): {
                 log.warn("DataCite was unable to understand the XML we send.");
                 log.warn("DataCite Metadata API returned a http status code "
-                             + "400: " + resp.getContent());
+                             + resp.getStatusCode() + ": " + resp.getContent());
                 Format format = Format.getCompactFormat();
                 format.setEncoding("UTF-8");
                 XMLOutputter xout = new XMLOutputter(format);
diff --git a/dspace/config/crosswalks/DIM2DataCite.xsl b/dspace/config/crosswalks/DIM2DataCite.xsl
index e92c371d6a77..867216484aa0 100644
--- a/dspace/config/crosswalks/DIM2DataCite.xsl
+++ b/dspace/config/crosswalks/DIM2DataCite.xsl
@@ -11,7 +11,7 @@
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:dspace="http://www.dspace.org/xmlns/dspace/dim"
-                xmlns="http://datacite.org/schema/kernel-3"
+		xmlns="http://datacite.org/schema/kernel-4"
                 version="2.0">
     
     <!-- CONFIGURATION -->
@@ -46,9 +46,9 @@
             properties are in the metadata of the item to export.
             The classe named above respects this.
         -->
-        <resource xmlns="http://datacite.org/schema/kernel-3"
+        <resource xmlns="http://datacite.org/schema/kernel-4"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd">
+		  xsi:schemaLocation="http://datacite.org/schema/kernel-4 https://schema.datacite.org/meta/kernel-4.4/metadata.xsd">
 
             <!--
                 MANDATORY PROPERTIES
@@ -139,6 +139,13 @@
                 </xsl:choose>
             </publicationYear>
 
+            <!--
+                DataCite (10)
+                Template call for ResourceType
+                DataCite allows the ResourceType to ouccre not more than once.
+            -->
+            <xsl:apply-templates select="(//dspace:field[@mdschema='dc' and @element='type'])[1]" />
+
             <!--
                 OPTIONAL PROPERTIES
             -->
@@ -214,13 +221,6 @@
             -->
             <xsl:apply-templates select="(//dspace:field[@mdschema='dc' and @element='language' and (@qualifier='iso' or @qualifier='rfc3066')])[1]" />
 
-            <!--
-                DataCite (10)
-                Template call for ResourceType
-                DataCite allows the ResourceType to ouccre not more than once.
-            -->
-            <xsl:apply-templates select="(//dspace:field[@mdschema='dc' and @element='type'])[1]" />
-
             <!-- 
                 DataCite (11)
                 Add alternativeIdentifiers.
@@ -469,35 +469,12 @@
         Adds resourceType and resourceTypeGeneral information
     -->
     <xsl:template match="//dspace:field[@mdschema='dc' and @element='type'][1]">
+	<xsl:variable name="types" select="tokenize(text(),';')"/>
         <xsl:element name="resourceType">
             <xsl:attribute name="resourceTypeGeneral">
-                <xsl:choose>
-                    <xsl:when test="string(text())='Animation'">Audiovisual</xsl:when>
-                    <xsl:when test="string(text())='Article'">Text</xsl:when>
-                    <xsl:when test="string(text())='Book'">Text</xsl:when>
-                    <xsl:when test="string(text())='Book chapter'">Text</xsl:when>
-                    <xsl:when test="string(text())='Dataset'">Dataset</xsl:when>
-                    <xsl:when test="string(text())='Learning Object'">InteractiveResource</xsl:when>
-                    <xsl:when test="string(text())='Image'">Image</xsl:when>
-                    <xsl:when test="string(text())='Image, 3-D'">Image</xsl:when>
-                    <xsl:when test="string(text())='Map'">Model</xsl:when>
-                    <xsl:when test="string(text())='Musical Score'">Other</xsl:when>
-                    <xsl:when test="string(text())='Plan or blueprint'">Model</xsl:when>
-                    <xsl:when test="string(text())='Preprint'">Text</xsl:when>
-                    <xsl:when test="string(text())='Presentation'">Text</xsl:when>
-                    <xsl:when test="string(text())='Recording, acoustical'">Sound</xsl:when>
-                    <xsl:when test="string(text())='Recording, musical'">Sound</xsl:when>
-                    <xsl:when test="string(text())='Recording, oral'">Sound</xsl:when>
-                    <xsl:when test="string(text())='Software'">Software</xsl:when>
-                    <xsl:when test="string(text())='Technical Report'">Text</xsl:when>
-                    <xsl:when test="string(text())='Thesis'">Text</xsl:when>
-                    <xsl:when test="string(text())='Video'">Audiovisual</xsl:when>
-                    <xsl:when test="string(text())='Working Paper'">Text</xsl:when>
-                    <xsl:when test="string(text())='Other'">Other</xsl:when>
-                    <xsl:otherwise>Other</xsl:otherwise>
-                </xsl:choose>
+		    <xsl:value-of select="$types[1]"/>
             </xsl:attribute>
-            <xsl:value-of select="." />
+            <xsl:value-of select="$types[2]" />
         </xsl:element>
     </xsl:template>
 
diff --git a/dspace/config/item-submission.xml b/dspace/config/item-submission.xml
index d0dc9285109a..50a36e7970e6 100644
--- a/dspace/config/item-submission.xml
+++ b/dspace/config/item-submission.xml
@@ -20,6 +20,7 @@
         <!-- Default submission process -->
         <name-map collection-handle="default" submission-name="traditional"/>
         <name-map collection-handle="123456789/1127" submission-name="clariah"/>
+        <name-map collection-handle="123456789/4" submission-name="datacite"/>
         <!-- Sample Entities Collection configuration based on the demo Entities dataset available at:
              https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
              This sets up the following Entity-based Collections in that dataset:
@@ -134,6 +135,11 @@
             <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
             <type>submission-form</type>
         </step-definition>
+        <step-definition id="datacitemandatory" mandatory="true">
+            <heading>submit.progressbar.describe.stepone</heading>
+            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+            <type>submission-form</type>
+        </step-definition>
 
         <step-definition id="upload">
             <heading>submit.progressbar.upload</heading>
@@ -252,7 +258,7 @@
             <step id="collection"/>
             <!-- To include the 'Show Identifiers' step, uncomment the line below. Make sure
                  that identifiers.cfg and identifier-service.xml are properly configured. -->
-            <!--<step id="identifiers"/>-->
+            <step id="identifiers"/><!---->
             <!--Step will be to Describe the item. -->
             <step id="traditionalpageone"/>
             <step id="traditionalpagetwo"/>
@@ -276,6 +282,15 @@
             <step id="clarin-license"/>
         </submission-process>
 
+        <submission-process name="datacite">
+            <step id="collection"></step>
+            <step id="identifiers"/><!---->
+            <step id="datacitemandatory"></step>
+            <step id="upload"/>
+            <step id="license"/>
+            <step id="clarin-license"/>
+        </submission-process>
+
         <!--
         Submission Process for 'Publication' Entities.
         These are not to be confused with default Items, as Publications may be linked with other Entities
diff --git a/dspace/config/spring/api/identifier-service.xml b/dspace/config/spring/api/identifier-service.xml
index dbcd49df0e92..a1dfdaa7c215 100644
--- a/dspace/config/spring/api/identifier-service.xml
+++ b/dspace/config/spring/api/identifier-service.xml
@@ -48,6 +48,7 @@
          depending on whether you have Item Level Versioning activated or not.
     -->
     <!--
+    -->
     <bean id="org.dspace.identifier.DOIIdentifierProvider"
         class="org.dspace.identifier.DOIIdentifierProvider"
         scope="singleton">
@@ -55,9 +56,8 @@
             ref="org.dspace.services.ConfigurationService" />
         <property name="DOIConnector"
             ref="org.dspace.identifier.doi.DOIConnector" />
-        <property name="filter" ref="doi-filter" />
+	    <!--<property name="filter" ref="doi-filter" />-->
     </bean>
-    -->
     <!--
     <bean id="org.dspace.identifier.DOIIdentifierProvider"
         class="org.dspace.identifier.VersionedDOIIdentifierProvider"
@@ -93,6 +93,7 @@
          DataCiteConnector won't work if EZID is your registration agency.
     -->
     <!-- Uncomment this to use the DataCite API directly as DOIConnector.
+    -->
     <bean id="org.dspace.identifier.doi.DOIConnector"
         class="org.dspace.identifier.doi.DataCiteConnector"
         scope="singleton">
@@ -102,7 +103,6 @@
         <property name='DATACITE_METADATA_PATH' value='/metadata/' />
         <property name='disseminationCrosswalkName' value="DataCite" />
     </bean>
-    -->
 
     <!-- Provider to mint and register DOIs using EZID as the registrar.
     -->
diff --git a/dspace/config/spring/api/item-filters.xml b/dspace/config/spring/api/item-filters.xml
index 24c463fb531e..e528603fb9eb 100644
--- a/dspace/config/spring/api/item-filters.xml
+++ b/dspace/config/spring/api/item-filters.xml
@@ -218,6 +218,19 @@
                         </bean>
                         <!-- Create DOIs for items only that do have at least one bitstream. -->
                         <ref bean="has-at-least-one-bitstream_condition"/>
+			<!--
+			<bean class="org.dspace.content.logic.condition.InCollectionCondition">
+				<property name="parameters">
+					<map>
+						<entry key="collections">
+							<list>
+								<value>123456789/4</value>
+							</list>
+						</entry>
+					</map>
+				</property>
+			</bean>
+			-->
                     </list>
                 </property>
             </bean>
diff --git a/dspace/config/submission-forms.xml b/dspace/config/submission-forms.xml
index 5ffe5229791a..c1f255b78edc 100644
--- a/dspace/config/submission-forms.xml
+++ b/dspace/config/submission-forms.xml
@@ -48,36 +48,80 @@
             </row>
         </form>
 
-        <!-- Form which defines the first page/section of the "traditional" DSpace submission process,
-             often used when depositing normal Items (i.e. Items which are not Entities). -->
-        <form name="traditionalpageone">
-            <!-- Example row for the complex input type definition.
-                 Uncomment it and the complex input will be showed in the submission UI. -->
+        <form name="datacitemandatory">
+            <!-- identifier autogenerated -->
+            <!-- creator -->
             <row>
                 <field>
-                    <dc-schema>local</dc-schema>
-                    <dc-element>contact</dc-element>
-                    <dc-qualifier>person</dc-qualifier>
+                    <dc-schema>dc</dc-schema>
+                    <dc-element>contributor</dc-element>
+                    <dc-qualifier>author</dc-qualifier>
                     <repeatable>true</repeatable>
-                    <label>Contact person</label>
-                    <style>col-sm-5</style>
-                    <input-type complex-definition-ref="contact_person">complex</input-type>
-                    <hint>This is contact person</hint>
+                    <label>Creator</label>
+                    <input-type>onebox</input-type>
+                    <hint>Personal name format should be: family, given.</hint>
                     <required></required>
                 </field>
             </row>
+            <!-- Title -->
             <row>
                 <field>
-                    <dc-schema>local</dc-schema>
-                    <dc-element>sponsor</dc-element>
-                    <repeatable>true</repeatable>
-                    <label>Funding</label>
-                    <style>col-sm-5</style>
-                    <input-type complex-definition-ref="funding">complex</input-type>
-                    <hint>This is funding</hint>
+                    <dc-schema>dc</dc-schema>
+                    <dc-element>title</dc-element>
+                    <dc-qualifier></dc-qualifier>
+                    <repeatable>false</repeatable>
+                    <label>Title</label>
+                    <input-type>onebox</input-type>
+                    <hint>A name or title by which a resource is known.</hint>
+                    <required>You must enter a title for this item.</required>
+                </field>
+            </row>
+            <!-- Publisher -->
+            <row>
+                <field>
+                    <dc-schema>dc</dc-schema>
+                    <dc-element>publisher</dc-element>
+                    <dc-qualifier></dc-qualifier>
+                    <repeatable>false</repeatable>
+                    <label>Publisher</label>
+                    <input-type>onebox</input-type>
+                    <hint>The name of the entity that holds, archives, publishes prints, distributes, releases,
+                        issues, or produces the resource.</hint>
                     <required></required>
                 </field>
             </row>
+            <!-- PublicationYear -->
+            <row>
+                <field>
+                    <dc-schema>dc</dc-schema>
+                    <dc-element>date</dc-element>
+                    <dc-qualifier>issued</dc-qualifier>
+                    <repeatable>false</repeatable>
+                    <label>Publication Year</label>
+                    <input-type>date</input-type>
+                    <hint>The year when the data was or will be made publicly available.</hint>
+                    <required>You must enter a publication year for this item.</required>
+                </field>
+            </row>
+
+            <!-- ResourceType is not repeatable -->
+            <row>
+                <field>
+                    <dc-schema>dc</dc-schema>
+                    <dc-element>type</dc-element>
+                    <dc-qualifier></dc-qualifier>
+                    <repeatable>false</repeatable>
+                    <label>Resource Type</label>
+                    <input-type complex-definition-ref="resourceType">complex</input-type>
+                    <hint></hint>
+                    <required>You must enter a resource type for this item.</required>
+                </field>
+            </row>
+        </form>
+
+        <!-- Form which defines the first page/section of the "traditional" DSpace submission process,
+             often used when depositing normal Items (i.e. Items which are not Entities). -->
+        <form name="traditionalpageone">
             <row>
                 <field>
                     <dc-schema>dc</dc-schema>
@@ -85,15 +129,9 @@
                     <dc-qualifier>author</dc-qualifier>
                     <repeatable>true</repeatable>
                     <label>Author</label>
-                    <input-type>clarin-name</input-type>
+                    <input-type>onebox</input-type>
                     <hint>Enter the author's name (Family name, Given names).</hint>
                     <required></required>
-                    <!-- Example ACL field definition.
-                         Uncomment it and the Author input field will be showed only for the admin.
-                     policy=(allow|deny),action=(read|write),grantee-type=(user|group),grantee-id=(<UUID>)
-                    <acl>
-                        policy=deny,action=read,grantee-type=user,grantee-id=*
-                    </acl> -->
                 </field>
             </row>
             <row>
@@ -166,7 +204,6 @@
                     <dc-qualifier>ispartofseries</dc-qualifier>
                     <repeatable>true</repeatable>
                     <label>Series/Report No.</label>
-                    <type-bind>Technical Report</type-bind>
                     <input-type>series</input-type>
                     <hint>Enter the series and number assigned to this item by your community.</hint>
                     <required></required>
@@ -215,56 +252,6 @@
                     <required></required>
                 </field>
             </row>
-            <row>
-                <field>
-                    <dc-schema>local</dc-schema>
-                    <dc-element>hasCMDI</dc-element>
-                    <repeatable>true</repeatable>
-                    <label>Has CMDI file</label>
-                    <input-type value-pairs-name="hasCMDI_checkbox">list</input-type>
-                    <hint>Are you going to upload cmdi file?</hint>
-                    <required></required>
-                    <acl>
-                        policy=deny,action=read,grantee-type=user,grantee-id=*
-                    </acl>
-                </field>
-            </row>
-            <row>
-                <field>
-                    <dc-schema>local</dc-schema>
-                    <dc-element>hidden</dc-element>
-                    <dc-qualifier/>
-                    <repeatable>true</repeatable>
-                    <label>Hidden but harvestable</label>
-                    <style>col-sm-4</style>
-                    <input-type value-pairs-name="hidden_list">list</input-type>
-                    <hint>Should item be harvestable thru OAI-PMH but behave like private?</hint>
-                    <required/>
-                    <acl>
-                        policy=deny,action=read,grantee-type=user,grantee-id=*
-                    </acl>
-                </field>
-            </row>
-            <row>
-                <field>
-                    <dc-schema>local</dc-schema>
-                    <dc-element>bitstream</dc-element>
-                    <dc-qualifier>redirectToURL</dc-qualifier>
-                    <repeatable>false</repeatable>
-                    <label>Big file URL</label>
-                    <input-type>onebox</input-type>
-                    <hint>
-                        The actual maximum upload size of the file is 4GB. To upload the file bigger than maximum
-                        upload size type the URL of that big file. Admin must know URL to that bitstream file.
-                        Then click on the 'Save' button and the file will start to upload. The file will be loaded
-                        from the '/temp' folder of the server. Example: /tomcat/temp/bitstream.png
-                    </hint>
-                    <required></required>
-                    <acl>
-                        policy=deny,action=read,grantee-type=user,grantee-id=*
-                    </acl>
-                </field>
-            </row>
         </form>
 
         <!-- Form which defines the second page/section of the "traditional" DSpace submission process,
@@ -322,7 +309,6 @@
             </row>
         </form>
 
-
         <!-- Form which defines the *first* metadata page/section for depositing Publication Entities.
              Since Publication Entities are very similar to normal Items, this is nearly identical to the
              'traditionalpageone' form. The only difference is the Author field can be used to link the
@@ -2106,6 +2092,153 @@
                 <stored-value>hidden</stored-value>
             </pair>
         </value-pairs>
+        
+        <value-pairs value-pairs-name="resource_type_general" dc-term="">
+            <!--
+            list all these values as <pair> elements, stored-value is the value from the list, displayed-value is
+            split by words. Don't forget the end tag </pair>:
+            Audiovisual
+            Book
+            BookChapter
+            Collection
+            ComputationalNotebook
+            ConferencePaper
+            ConferenceProceeding
+            DataPaper
+            Dataset
+            Dissertation
+            Event
+            Image
+            InteractiveResource
+            Journal
+            JournalArticle
+            Model
+            OutputManagementPlan
+            PeerReview
+            PhysicalObject
+            Preprint
+            Report
+            Service
+            Software
+            Sound
+            Standard
+            Text
+            Workflow
+            Other
+            -->
+            <pair>
+                <displayed-value>Audiovisual</displayed-value>
+                <stored-value>Audiovisual</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Book</displayed-value>
+                <stored-value>Book</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Book Chapter</displayed-value>
+                <stored-value>BookChapter</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Collection</displayed-value>
+                <stored-value>Collection</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Computational Notebook</displayed-value>
+                <stored-value>ComputationalNotebook</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Conference Paper</displayed-value>
+                <stored-value>ConferencePaper</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Conference Proceeding</displayed-value>
+                <stored-value>ConferenceProceeding</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Data Paper</displayed-value>
+                <stored-value>DataPaper</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Dataset</displayed-value>
+                <stored-value>Dataset</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Dissertation</displayed-value>
+                <stored-value>Dissertation</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Event</displayed-value>
+                <stored-value>Event</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Image</displayed-value>
+                <stored-value>Image</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Interactive Resource</displayed-value>
+                <stored-value>InteractiveResource</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Journal</displayed-value>
+                <stored-value>Journal</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Journal Article</displayed-value>
+                <stored-value>JournalArticle</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Model</displayed-value>
+                <stored-value>Model</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Output Management Plan</displayed-value>
+                <stored-value>OutputManagementPlan</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Peer Review</displayed-value>
+                <stored-value>PeerReview</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Physical Object</displayed-value>
+                <stored-value>PhysicalObject</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Preprint</displayed-value>
+                <stored-value>Preprint</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Report</displayed-value>
+                <stored-value>Report</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Service</displayed-value>
+                <stored-value>Service</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Software</displayed-value>
+                <stored-value>Software</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Sound</displayed-value>
+                <stored-value>Sound</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Standard</displayed-value>
+                <stored-value>Standard</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Text</displayed-value>
+                <stored-value>Text</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Workflow</displayed-value>
+                <stored-value>Workflow</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>Other</displayed-value>
+                <stored-value>Other</stored-value>
+            </pair>
+        </value-pairs>
 
     </form-value-pairs>
 
@@ -2126,5 +2259,13 @@
             <input name="projname" input-type="autocomplete" label="Funding project name"/>
             <input name="openaire_id" input-type="text" label="EU Project Identifier (OpenAIRE)" readonly="true" placeholder="Filled out automatically..." mapped-to-if-not-default="dc.relation"/>
         </definition>
+
+        <definition name="resourceType">
+            <input name="resourceTypeGeneral" input-type="dropdown" label="General Resource Type" 
+                   value-pairs-name="resource_type_general"/> 
+            <input name="resourceType" input-type="text" label="Resource Type" 
+                   placeholder="Free-format description of the resource"/>
+
+        </definition>
     </form-complex-definitions>
 </input-forms>