diff --git a/deploy.sample.php b/deploy.sample.php
index 884c9f0..98fffff 100755
--- a/deploy.sample.php
+++ b/deploy.sample.php
@@ -75,6 +75,7 @@
     'deploy:assets:install',
     'deploy:yarn:install',                 // Remove if you don't use yarn
     'deploy:yarn:encore:production',       // Remove if you don't use yarn
+    'deploy:pimcore:migrate:core',
     'deploy:pimcore:migrate',
     'deploy:clear_paths',
     'deploy:pimcore:rebuild-classes',
diff --git a/recipes/coreshop.php b/recipes/coreshop.php
new file mode 100644
index 0000000..00ac77a
--- /dev/null
+++ b/recipes/coreshop.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * w-vision
+ *
+ * LICENSE
+ *
+ * For the full copyright and license information, please view the LICENSE.md
+ * file that is distributed with this source code.
+ *
+ * @copyright  Copyright (c) 2018 w-vision AG (https://www.w-vision.ch)
+ */
+
+namespace Deployer;
+
+task('deploy:pimcore:migrate:coreshop', function() {
+    run('{{bin/php}} {{bin/console}} pimcore:migrations:migrate -b CoreShopCoreBundle -n');
+});
diff --git a/recipes/pimcore.php b/recipes/pimcore.php
index e1cffec..a407cdc 100644
--- a/recipes/pimcore.php
+++ b/recipes/pimcore.php
@@ -20,11 +20,19 @@
     run('{{bin/php}} {{bin/console}} deployment:classes-rebuild -c -d');
 });
 
+task('deploy:pimcore:migrate:core', function() {
+    run('{{bin/php}} {{bin/console}} pimcore:migrations:migrate -s pimcore_core -n');
+});
+
 task('deploy:pimcore:migrate', function () {
     run('{{bin/php}} {{bin/console}} pimcore:migrations:migrate');
 });
 
 task('deploy:pimcore:merge:shared', function () {
+    if (!has('pimcore_shared_configurations')) {
+        return;
+    }
+
     $sharedFiles = get('shared_files');
     $pimcoreSharedConfigFiles = get('pimcore_shared_configurations');
 
@@ -36,6 +44,10 @@
 // Process the pimcore config files
 // Add empty array if file is empty
 task('deploy:pimcore:shared:config', function () {
+    if (!has('pimcore_shared_configurations')) {
+        return;
+    }
+
     $sharedPath = "{{deploy_path}}/shared";
     $emptyContent = "<?php return [];";