diff --git a/Dockerfile-composer b/Dockerfile-composer
new file mode 100644
index 00000000..37a119b7
--- /dev/null
+++ b/Dockerfile-composer
@@ -0,0 +1,18 @@
+FROM php:7.0.30-fpm
+RUN apt-get update && apt-get install -y \
+       libpq-dev \
+       libmcrypt-dev \
+       libpng-dev \
+       libjpeg62-turbo-dev \
+       libfreetype6-dev \
+       libxrender1 \
+       libfontconfig \
+       libxext-dev \
+ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+ && docker-php-ext-install -j$(nproc) pdo_pgsql pgsql mcrypt gd zip
+
+RUN apt-get install -y zip unzip curl git
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php composer-setup.php --install-dir=/usr/bin --filename=composer
+RUN php -r "unlink('composer-setup.php');"
+WORKDIR /usr/share/nginx/html/attendize
\ No newline at end of file
diff --git a/Dockerfile-php b/Dockerfile-php
index fd58e7c1..96c89182 100644
--- a/Dockerfile-php
+++ b/Dockerfile-php
@@ -1,4 +1,4 @@
-FROM php:7.0-fpm
+FROM php:7.0.30-fpm
 RUN apt-get update && apt-get install -y \
        libpq-dev \ 
        libmcrypt-dev \
diff --git a/docker-compose.yml b/docker-compose.yml
index ae633d85..0b1c1075 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,6 +25,16 @@ services:
       - .:/usr/share/nginx/html/attendize
     networks: 
       - attendizenet
+  composer:
+    build:
+      context: .
+      dockerfile: Dockerfile-composer
+    depends_on:
+      - php
+    volumes:
+      - .:/usr/share/nginx/html/attendize
+    networks:
+      - attendizenet
   php-worker:
     build:
       context: .
@@ -39,13 +49,9 @@ services:
     networks:
       - attendizenet
   db:
-    image: postgres
-    environment:
-      - POSTGRES_USER=attendize
-      - POSTGRES_PASSWORD=attendize
-      - POSTGRES_DB=attendize
+    image: mysql
     ports:
-      - "5433:5432"
+      - "3306:3306"
     volumes:
       - ./docker/pgdata:/var/lib/postgresql/data
     networks: