diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index 0d74c28..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-workspace:
-  base: /test
-  path: behat-traits
-
-services:
-  web:
-    image: ${IMAGE_PHP=fpfis/httpd-php-dev:7.1}
-    environment:
-      - DOCUMENT_ROOT=/test/behat-traits
-  mysql:
-    image: percona/percona-server:5.6
-    environment:
-      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
-
-pipeline:
-  composer-install-lowest:
-    group: prepare
-    image: ${IMAGE_PHP=fpfis/httpd-php-dev:7.1}
-    commands:
-      # @todo remove "composer install" step once the following issue is fixed.
-      # @link https://webgate.ec.europa.eu/CITnet/jira/browse/OPENEUROPA-1234
-      - composer install --ansi --no-suggest --no-progress
-      - composer update --prefer-lowest --ansi --no-suggest --no-progress
-    when:
-      matrix:
-        COMPOSER_BOUNDARY: lowest
-
-  composer-install-highest:
-    group: prepare
-    image: ${IMAGE_PHP=fpfis/httpd-php-dev:7.1}
-    commands:
-      - composer update
-    when:
-      matrix:
-        COMPOSER_BOUNDARY: highest
-
-  site-install:
-    group: install
-    image: ${IMAGE_PHP=fpfis/httpd-php-dev:7.1}
-    commands:
-      - ./vendor/bin/run drupal:site-install
-
-  grumphp:
-    group: test
-    image: ${IMAGE_PHP=fpfis/httpd-php-dev:7.1}
-    commands:
-      - ./vendor/bin/grumphp run
-
-  behat:
-    group: test
-    image: ${IMAGE_PHP=fpfis/httpd-php-dev:7.1}
-    commands:
-      - ./vendor/bin/behat
-
-matrix:
-  IMAGE_PHP:
-    - fpfis/httpd-php-dev:7.1
-    - fpfis/httpd-php-dev:7.2
-  COMPOSER_BOUNDARY:
-    - lowest
-    - highest
diff --git a/behat.yml.dist b/behat.yml.dist
index 83e63cb..1e84880 100644
--- a/behat.yml.dist
+++ b/behat.yml.dist
@@ -2,7 +2,7 @@ default:
   suites:
     default:
       paths:
-        - %paths.base%/tests/features
+        - "%paths.base%/tests/features"
       contexts:
         - DrupalTest\BehatTraits\Context\BrowserCapabilityDetectionContext
         - DrupalTest\BehatTraits\Context\EntityContext
diff --git a/composer.json b/composer.json
index 2cdb4fb..ecc745b 100644
--- a/composer.json
+++ b/composer.json
@@ -4,21 +4,20 @@
     "type": "library",
     "license": "EUPL-1.2",
     "require": {
-        "php": "~7.1",
-        "drupal/core": "~8.6",
+        "php": "~7.2",
+        "drupal/core": "^8.9 || ^9",
         "drupal/drupal-extension": "~4.0"
     },
     "require-dev": {
         "composer/installers": "~1.2",
-        "consolidation/robo": "~1.3",
-        "drush/drush": "~9.4",
-        "drupal-composer/drupal-scaffold": "~2.2",
+        "drush/drush": "~10.3",
+        "drupal/core-composer-scaffold": "^8.9 || ^9",
         "guzzlehttp/guzzle": "~6.3",
         "instaclick/php-webdriver": "^1.4.5",
         "nikic/php-parser": "~3.0|~4.0",
-        "openeuropa/code-review": "^1.0.0-alpha4",
-        "openeuropa/task-runner": "^1.0.0-beta3",
-        "webflo/drupal-core-require-dev": "~8.6"
+        "openeuropa/code-review": "~1.6",
+        "openeuropa/task-runner": "^1.0.0-beta6",
+        "drupal/core-dev": "^8.9 || ^9"
     },
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
@@ -35,6 +34,11 @@
             "build/core": ["type:drupal-core"],
             "build/modules/contrib/{$name}": ["type:drupal-module"],
             "build/themes/contrib/{$name}": ["type:drupal-theme"]
+        },
+        "drupal-scaffold": {
+            "locations": {
+                "web-root": "./build"
+            }
         }
     },
     "autoload": {
diff --git a/docker-compose.yml b/docker-compose.yml
index 5a4fff1..ce63923 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   web:
-    image: fpfis/httpd-php-dev:7.2
+    image: fpfis/httpd-php-dev:7.3
     working_dir: /var/www/html
     ports:
       - 8080:8080
@@ -11,7 +11,8 @@ services:
       XDEBUG_CONFIG: "remote_enable=1 remote_host=${DOCKER_HOST_IP} remote_port=9000 idekey=PHPSTORM remote_autostart=1"
       PHP_IDE_CONFIG: "serverName=Test"
   mysql:
-    image: percona/percona-server:5.6
+    image: percona/percona-server:5.7
+    command: --innodb-log-file-size=1G --max_allowed_packet=1G --innodb-buffer-pool-size=512M --wait_timeout=3000 --net_write_timeout=3000 --log_error_verbosity=3
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
   selenium:
diff --git a/grumphp.yml.dist b/grumphp.yml.dist
index d3b85b1..3a5923f 100644
--- a/grumphp.yml.dist
+++ b/grumphp.yml.dist
@@ -6,9 +6,9 @@ parameters:
     - '/[A-Z].+\./'
   extra_tasks:
     phpparser:
-      ignore_patterns: %tasks.phpcs.ignore_patterns%
+      ignore_patterns: "%tasks.phpcs.ignore_patterns%"
       visitors:
         declare_strict_types: ~
-      triggered_by: %tasks.phpcs.triggered_by%
+      triggered_by: "%tasks.phpcs.triggered_by%"
   extensions:
     - OpenEuropa\CodeReview\ExtraTasksExtension
diff --git a/runner.yml.dist b/runner.yml.dist
index 0efb830..e4ae6a0 100644
--- a/runner.yml.dist
+++ b/runner.yml.dist
@@ -13,8 +13,8 @@ drupal:
   post_install:
     - "./vendor/bin/drush cr"
   settings:
-    config_directories:
-      sync: "../tests/config/sync"
+    settings:
+      config_sync_directory: "../tests/config/sync"
 
 selenium:
   host: "http://selenium"