diff --git a/Components/ConfirmationMail/ConfirmationMailRepository.php b/Components/ConfirmationMail/ConfirmationMailRepository.php
index 6a7ec4e..59a8780 100644
--- a/Components/ConfirmationMail/ConfirmationMailRepository.php
+++ b/Components/ConfirmationMail/ConfirmationMailRepository.php
@@ -58,7 +58,7 @@ public function getArticleDetailsByOrderNumber($ordernumber)
             'details.purchaseunit',
             'details.releasedate',
             'details.unitID',
-            'article.laststock',
+            'details.laststock',
             'article.mode as modus',
             'article.main_detail_id as mainDetailId',
             'article.taxID',
diff --git a/Components/Order/Validator/Constraints/LastStockValidator.php b/Components/Order/Validator/Constraints/LastStockValidator.php
index e719fd2..0752010 100644
--- a/Components/Order/Validator/Constraints/LastStockValidator.php
+++ b/Components/Order/Validator/Constraints/LastStockValidator.php
@@ -96,7 +96,7 @@ private function isValid($inStock, $quantity)
     private function isLastStockProduct($orderNumber)
     {
         $builder = $this->connection->createQueryBuilder();
-        $builder->select('article.laststock')
+        $builder->select('details.laststock')
             ->from('s_articles', 'article')
             ->leftJoin('article', 's_articles_details', 'details', 'details.articleID = article.id')
             ->where('ordernumber = :number')
diff --git a/Resources/config.xml b/Resources/config.xml
index c045a75..235b5b6 100644
--- a/Resources/config.xml
+++ b/Resources/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../engine/Shopware/Components/Plugin/schema/config.xsd">
+        xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/shopware/shopware/5.4/engine/Shopware/Components/Plugin/schema/config.xsd">
 
     <elements>
         <element required="true" type="text">
diff --git a/composer.json b/composer.json
index 3802e49..2dd1f20 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "shopware/swag-backend-order",
+    "name": "shopwareLabs/swag-backend-order",
     "type": "shopware-plugin",
     "description": "Plugin which allows you to create orders via the backend orders module.",
     "license": "MIT",
diff --git a/plugin.xml b/plugin.xml
index cd0b34e..05f0c2e 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../engine/Shopware/Components/Plugin/schema/plugin.xsd">
+        xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/shopware/shopware/5.4/engine/Shopware/Components/Plugin/schema/plugin.xsd">
 
     <label lang="de">Backend Bestellungen</label>
     <label lang="en">Backend orders</label>
 
-    <version>2.1.0</version>
+    <version>2.2.0</version>
     <copyright>(c) by shopware AG</copyright>
     <license>proprietary</license>
     <link>http://store.shopware.com</link>
     <author>shopware AG</author>
-    <compatibility minVersion="5.2.0"/>
+    <compatibility minVersion="5.4.0"/>
+
+    <changelog version="2.2.0">
+        <changes lang="de">PT-8810 - Shopware 5.4 Kompatibilität;</changes>
+        <changes lang="en">PT-8810 - Shopware 5.4 compatibility;</changes>
+    </changelog>
 
     <changelog version="2.1.0">
         <changes lang="de">PT-8793 - Obsoleten Code entfernt; Composer Kompatibilität;</changes>