diff --git a/.travis.yml b/.travis.yml
index a4b5d1de..bc9f9a44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,8 @@ branches:
     - /.*/
 
 php:
-  - '7.2'
-  - '7.3'
   - '7.4'
 
-matrix:
-  allow_failures:
-    - php: '7.4'
-
 services:
   - mysql
   - postgresql
diff --git a/Dockerfile b/Dockerfile
index f24dd289..44915098 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3.11-alpine3.10
+FROM php:7.4.0-alpine3.10
 LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
 
 ARG SHLINK_VERSION=1.20.2
diff --git a/composer.json b/composer.json
index 7782f61d..b49848cd 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.4",
         "ext-json": "*",
         "ext-pdo": "*",
         "akrabat/ip-address-middleware": "^1.0",
@@ -30,7 +30,7 @@
         "mikehaertl/phpwkhtmltopdf": "^2.2",
         "monolog/monolog": "^2.0",
         "nikolaposa/monolog-factory": "^3.0",
-        "ocramius/proxy-manager": "~2.2.2",
+        "ocramius/proxy-manager": "^2.5.1",
         "phly/phly-event-dispatcher": "^1.0",
         "predis/predis": "^1.1",
         "pugx/shortid-php": "^0.5",
diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile
index 0cb74aaa..dffcc75e 100644
--- a/data/infra/php.Dockerfile
+++ b/data/infra/php.Dockerfile
@@ -1,18 +1,20 @@
-FROM php:7.3.11-fpm-alpine3.10
+FROM php:7.4.0-fpm-alpine3.10
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV APCU_VERSION 5.1.18
 ENV APCU_BC_VERSION 1.0.5
-ENV XDEBUG_VERSION 2.8.0
+ENV XDEBUG_VERSION 2.9.0
 
 RUN apk update
 
 # Install common php extensions
 RUN docker-php-ext-install pdo_mysql
 RUN docker-php-ext-install iconv
-RUN docker-php-ext-install mbstring
 RUN docker-php-ext-install calendar
 
+RUN apk add --no-cache oniguruma-dev
+RUN docker-php-ext-install mbstring
+
 RUN apk add --no-cache sqlite-libs
 RUN apk add --no-cache sqlite-dev
 RUN docker-php-ext-install pdo_sqlite
diff --git a/data/infra/swoole.Dockerfile b/data/infra/swoole.Dockerfile
index ea7dc230..8209e905 100644
--- a/data/infra/swoole.Dockerfile
+++ b/data/infra/swoole.Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3.11-alpine3.10
+FROM php:7.4.0-alpine3.10
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV APCU_VERSION 5.1.18
@@ -11,9 +11,11 @@ RUN apk update
 # Install common php extensions
 RUN docker-php-ext-install pdo_mysql
 RUN docker-php-ext-install iconv
-RUN docker-php-ext-install mbstring
 RUN docker-php-ext-install calendar
 
+RUN apk add --no-cache oniguruma-dev
+RUN docker-php-ext-install mbstring
+
 RUN apk add --no-cache sqlite-libs
 RUN apk add --no-cache sqlite-dev
 RUN docker-php-ext-install pdo_sqlite