diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21c0feeb9e451b984dcdfae347891795bcec11f0..d4977f34ef2956f8dfc5bcdb0dd4462bf6368478 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,9 +15,9 @@ build:
         GIT_STRATEGY: "clone"
         GIT_SUBMODULE_STRATEGY: "recursive"
     script:
-        - ./.gitlab-ci/composer.sh config store-auths false
-        - ./.gitlab-ci/composer.sh config http-basic.git-t3o.typo3.org gitlab-ci-token ${CI_BUILD_TOKEN}
-        - ./.gitlab-ci/composer.sh install
+        - ./.gitlab-ci/scripts/composer.sh config store-auths false
+        - ./.gitlab-ci/scripts/composer.sh config http-basic.git-t3o.typo3.org gitlab-ci-token ${CI_BUILD_TOKEN}
+        - ./.gitlab-ci/scripts/composer.sh install
     artifacts:
         paths:
             - ./
@@ -27,7 +27,7 @@ build:
 deploy-master:
     stage: deploy
     script:
-        - ./.gitlab-ci/deployer.sh ${CI_BUILD_REF_NAME}
+        - ./.gitlab-ci/scripts/deployer.sh ${CI_BUILD_REF_NAME}
     environment:
         name: master
         url: https://t3o-master.typo3.org/
@@ -38,7 +38,7 @@ deploy-master:
 deploy-develop:
     stage: deploy
     script:
-        - ./.gitlab-ci/deployer.sh ${CI_BUILD_REF_NAME}
+        - ./.gitlab-ci/scripts/deployer.sh -f/src/data/etc/deployer/ter/deploy.php deploy ${CI_BUILD_REF_NAME}
     environment:
         name: develop
         url: https://t3o-develop.typo3.org/
diff --git a/.gitlab-ci/deployer/deploy.php b/.gitlab-ci/deployer/deploy.php
new file mode 100644
index 0000000000000000000000000000000000000000..561cadd7c0ef880bdc5e6bc73d5f7f60e0cbdd0a
--- /dev/null
+++ b/.gitlab-ci/deployer/deploy.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Deployer;
+
+require_once '/composer/vendor/deployer/deployer/recipe/common.php';
+require_once '/composer/vendor/deployer/recipes/rsync.php';
+
+$sharedDirectories = [
+    'fileadmin',
+    'uploads',
+    '.well-known'
+];
+set('shared_dirs', $sharedDirectories);
+
+$sharedFiles = [
+    '.htaccess',
+    'typo3conf/LocalConfiguration.php',
+];
+set('shared_files', $sharedFiles);
+
+$writeableDirectories = [
+    'typo3temp',
+    'fileadmin',
+    'uploads'
+];
+set('writable_dirs', $writeableDirectories);
+
+$exclude = [
+    '.gitignore',
+    '.git',
+    'Readme.rst',
+    'Readme.txt',
+    'Upgrading.rst',
+    'Upgrading.txt',
+    'README',
+    '*.example',
+    'AdditionalConfiguration.sample.php'
+];
+set('rsync', [
+    'exclude' => array_merge($sharedDirectories, $sharedFiles, $exclude),
+    'exclude-file' => false,
+    'include' => [],
+    'include-file' => false,
+    'filter' => [],
+    'filter-file' => false,
+    'filter-perdir' => false,
+    'flags' => 'az',
+    'options' => ['delete'],
+    'timeout' => 300
+]);
+set('rsync_src', '/src/html/');
+set('keep_releases', 10);
+serverList('/src/.gitlab-ci/deployer/servers.yml');
+
+task('deploy', [
+    'deploy:prepare',
+    'deploy:release',
+    'rsync:warmup',
+    'rsync',
+    'deploy:shared',
+    'deploy:writable',
+    'deploy:symlink',
+    'cleanup'
+]);
diff --git a/.gitlab-ci/deployer/servers.yml b/.gitlab-ci/deployer/servers.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a55786966db830caad5f5e3040232a4e547b01c1
--- /dev/null
+++ b/.gitlab-ci/deployer/servers.yml
@@ -0,0 +1,12 @@
+master:
+    host: extensions.typo3.org
+    port: 22179
+    user: extensions
+    forward_agent: true
+    deploy_path: ~/ci/
+develop:
+    host: extensions-dev.typo3.org
+    port: 22179
+    user: extensionsdev
+    forward_agent: true
+    deploy_path: ~/ci/
diff --git a/.gitlab-ci b/.gitlab-ci/scripts
similarity index 100%
rename from .gitlab-ci
rename to .gitlab-ci/scripts
diff --git a/.gitmodules b/.gitmodules
index 08c41295d48e8e7678cf5e66474d0e72406f07eb..add05cd3140878516c91c79d6684ec1bebe9b653 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule ".gitlab-ci"]
-	path = .gitlab-ci
+	path = .gitlab-ci/scripts
 	url = https://github.com/torvitas/docker-scripts.git
diff --git a/composer.lock b/composer.lock
index 64e3ba7b9fe2156b584dd5ada158ceb98d318eaa..08cde2f669d345ccf9c1180b73d447c8304cc208 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,6 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
+    "hash": "26982d9f82bef372c305c1222157d6cb",
     "content-hash": "ef31fc60ecb77d0d1f9bdc79ed26c3c6",
     "packages": [
         {
@@ -68,7 +69,7 @@
                 "solr",
                 "typo3"
             ],
-            "time": "2016-12-14T08:52:44+00:00"
+            "time": "2016-12-14 08:52:44"
         },
         {
             "name": "cogpowered/finediff",
@@ -119,7 +120,7 @@
                 "string",
                 "text"
             ],
-            "time": "2014-05-19T10:25:02+00:00"
+            "time": "2014-05-19 10:25:02"
         },
         {
             "name": "dmitryd/typo3-realurl",
@@ -184,7 +185,7 @@
                 "cms",
                 "typo3"
             ],
-            "time": "2017-02-13T00:00:00+00:00"
+            "time": "2017-02-13 00:00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -238,7 +239,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14T21:17:01+00:00"
+            "time": "2015-06-14 21:17:01"
         },
         {
             "name": "helhum/typo3-console",
@@ -323,7 +324,7 @@
                 "console",
                 "typo3"
             ],
-            "time": "2017-01-12T01:21:41+00:00"
+            "time": "2017-01-12 01:21:41"
         },
         {
             "name": "helhum/typo3-console-plugin",
@@ -378,7 +379,7 @@
                 "plugin",
                 "typo3 console"
             ],
-            "time": "2017-01-26T11:55:03+00:00"
+            "time": "2017-01-26 11:55:03"
         },
         {
             "name": "mso/idna-convert",
@@ -428,7 +429,7 @@
                 "idna",
                 "php"
             ],
-            "time": "2016-01-06T21:05:46+00:00"
+            "time": "2016-01-06 21:05:46"
         },
         {
             "name": "pear/http_request2",
@@ -487,7 +488,7 @@
                 "http",
                 "request"
             ],
-            "time": "2016-02-13T20:20:39+00:00"
+            "time": "2016-02-13 20:20:39"
         },
         {
             "name": "pear/net_url2",
@@ -548,7 +549,7 @@
                 "uri",
                 "url"
             ],
-            "time": "2016-04-18T22:24:01+00:00"
+            "time": "2016-04-18 22:24:01"
         },
         {
             "name": "pear/pear_exception",
@@ -603,7 +604,7 @@
             "keywords": [
                 "exception"
             ],
-            "time": "2015-02-10T20:07:52+00:00"
+            "time": "2015-02-10 20:07:52"
         },
         {
             "name": "psr/http-message",
@@ -653,7 +654,7 @@
                 "request",
                 "response"
             ],
-            "time": "2016-08-06T14:39:51+00:00"
+            "time": "2016-08-06 14:39:51"
         },
         {
             "name": "psr/log",
@@ -700,7 +701,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10T12:19:37+00:00"
+            "time": "2016-10-10 12:19:37"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -754,7 +755,7 @@
                 "mail",
                 "mailer"
             ],
-            "time": "2017-02-13T07:52:53+00:00"
+            "time": "2017-02-13 07:52:53"
         },
         {
             "name": "symfony/console",
@@ -815,7 +816,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-06T12:04:06+00:00"
+            "time": "2017-02-06 12:04:06"
         },
         {
             "name": "symfony/debug",
@@ -872,7 +873,7 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2016-07-30T07:22:48+00:00"
+            "time": "2016-07-30 07:22:48"
         },
         {
             "name": "symfony/finder",
@@ -921,7 +922,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
+            "time": "2017-01-02 20:30:24"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -980,7 +981,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14T01:06:16+00:00"
+            "time": "2016-11-14 01:06:16"
         },
         {
             "name": "symfony/process",
@@ -1029,7 +1030,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-16T14:07:22+00:00"
+            "time": "2017-02-16 14:07:22"
         },
         {
             "name": "t3o/t3olayout",
@@ -1037,7 +1038,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git-t3o.typo3.org/t3o/t3olayout.git",
-                "reference": "433079e18b86f8fa63ae547c202c9b58efc1757e"
+                "reference": "2b98e1df2e6fff33d780967c674800e3a7ba7ce1"
             },
             "type": "typo3-cms-extension",
             "autoload": {
@@ -1053,7 +1054,7 @@
             "keywords": [
                 "TYPO3 CMS"
             ],
-            "time": "2017-03-02 11:41:14"
+            "time": "2017-03-02 21:01:30"
         },
         {
             "name": "typo3/class-alias-loader",
@@ -1111,7 +1112,7 @@
                 "classloader",
                 "composer"
             ],
-            "time": "2015-10-06T10:25:44+00:00"
+            "time": "2015-10-06 10:25:44"
         },
         {
             "name": "typo3/cms",
@@ -1310,7 +1311,7 @@
                 "extbase",
                 "typo3"
             ],
-            "time": "2017-02-28T10:42:40+00:00"
+            "time": "2017-02-28 10:42:40"
         },
         {
             "name": "typo3/cms-composer-installers",
@@ -1378,7 +1379,7 @@
                 "installer",
                 "typo3"
             ],
-            "time": "2016-07-05T09:38:42+00:00"
+            "time": "2016-07-05 09:38:42"
         }
     ],
     "packages-dev": [],