diff --git a/nginx-ubuntu/50-kimai-init.sh b/apache-alpine/50-kimai-init.sh
similarity index 100%
rename from nginx-ubuntu/50-kimai-init.sh
rename to apache-alpine/50-kimai-init.sh
diff --git a/apache-alpine/Dockerfile b/apache-alpine/Dockerfile
new file mode 100644
index 0000000..6ec0718
--- /dev/null
+++ b/apache-alpine/Dockerfile
@@ -0,0 +1,18 @@
+FROM webdevops/php-apache:alpine
+MAINTAINER Belman Kraul <bkraul@belmankraul.com>
+
+ENV \
+    WEB_DOCUMENT_ROOT="/app/public" 
+
+RUN git clone https://github.com/kevinpapst/kimai2.git /app && \
+    sed "s/prod/dev/g" /app/.env.dist > /app/.env && \
+    chown -R ${APPLICATION_UID}:${APPLICATION_GID} /app	&& \
+    su -c '/usr/local/bin/composer install --working-dir=/app --optimize-autoloader' -l application && \
+    su -c '/usr/local/bin/composer require zendframework/zend-ldap --working-dir=/app' -l application && \
+    rm /app/.env && \
+    touch /app/.env && \
+    chown ${APPLICATION_UID}:${APPLICATION_GID} /app/.env
+
+COPY ./50-kimai-init.sh /opt/docker/provision/entrypoint.d/50-kimai-init.sh
+
+WORKDIR /app
\ No newline at end of file
diff --git a/apache-alpine/build b/apache-alpine/build
new file mode 100644
index 0000000..7a4201a
--- /dev/null
+++ b/apache-alpine/build
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+docker pull webdevops/php-apache:alpine
+docker build $1\
+  -t bkraul/kimai2:apache-alpine \
+  .
\ No newline at end of file
diff --git a/apache-ubuntu-18.04/50-kimai-init.sh b/apache-ubuntu-18.04/50-kimai-init.sh
new file mode 100644
index 0000000..8df1135
--- /dev/null
+++ b/apache-ubuntu-18.04/50-kimai-init.sh
@@ -0,0 +1,15 @@
+#!/bin
+
+echo Refreshing .env file...
+echo APP_ENV=${APP_ENV} > /app/.env
+echo DATABASE_URL=${DATABASE_URL} >> /app/.env
+echo MAILER_FROM=${MAILER_FROM} >> /app/.env
+echo MAILER_URL=${MAILER_URL} >> /app/.env
+chown ${APPLICATION_UID}:${APPLICATION_GID} /app/.env
+
+su -c "/app/bin/console cache:clear --env=${APP_ENV} || true" -l application
+su -c "cd /app && composer install --optimize-autoloader || true" -l application
+su -c "/app/bin/console doctrine:schema:create || true" -l application
+su -c "/app/bin/console doctrine:migrations:version --add --all -n || true" -l application
+su -c "/app/bin/console cache:warmup --env=${APP_ENV} || true" -l application
+su -c "/app/bin/console kimai:create-user ${APP_ADMIN_USER} ${APP_ADMIN_EMAIL} ROLE_SUPER_ADMIN ${APP_ADMIN_PASS} --env=${APP_ENV} -vvv || true" -l application
\ No newline at end of file
diff --git a/apache-ubuntu-18.04/Dockerfile b/apache-ubuntu-18.04/Dockerfile
new file mode 100644
index 0000000..2807920
--- /dev/null
+++ b/apache-ubuntu-18.04/Dockerfile
@@ -0,0 +1,18 @@
+FROM webdevops/php-apache:ubuntu-18.04
+MAINTAINER Belman Kraul <bkraul@belmankraul.com>
+
+ENV \
+    WEB_DOCUMENT_ROOT="/app/public" 
+
+RUN git clone https://github.com/kevinpapst/kimai2.git /app && \
+    sed "s/prod/dev/g" /app/.env.dist > /app/.env && \
+    chown -R ${APPLICATION_UID}:${APPLICATION_GID} /app	&& \
+    su -c '/usr/local/bin/composer install --working-dir=/app --optimize-autoloader' -l application && \
+    su -c '/usr/local/bin/composer require zendframework/zend-ldap --working-dir=/app' -l application && \
+    rm /app/.env && \
+    touch /app/.env && \
+    chown ${APPLICATION_UID}:${APPLICATION_GID} /app/.env
+
+COPY ./50-kimai-init.sh /opt/docker/provision/entrypoint.d/50-kimai-init.sh
+
+WORKDIR /app
\ No newline at end of file
diff --git a/apache-ubuntu-18.04/build b/apache-ubuntu-18.04/build
new file mode 100644
index 0000000..7c09f0b
--- /dev/null
+++ b/apache-ubuntu-18.04/build
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+docker pull webdevops/php-apache:ubuntu-18.04
+docker build $1\
+  -t bkraul/kimai2:apache-ubuntu-18.04 \
+  .
\ No newline at end of file
diff --git a/nginx-alpine/Dockerfile b/nginx-alpine/Dockerfile
index 026ce02..7f3058a 100644
--- a/nginx-alpine/Dockerfile
+++ b/nginx-alpine/Dockerfile
@@ -2,17 +2,17 @@ FROM webdevops/php-nginx:alpine
 MAINTAINER Belman Kraul <bkraul@belmankraul.com>
 
 ENV \
-	WEB_DOCUMENT_ROOT="/app/public" 
+    WEB_DOCUMENT_ROOT="/app/public" 
 
 RUN git clone https://github.com/kevinpapst/kimai2.git /app && \
     sed "s/prod/dev/g" /app/.env.dist > /app/.env && \
     chown -R ${APPLICATION_UID}:${APPLICATION_GID} /app	&& \
     su -c '/usr/local/bin/composer install --working-dir=/app --optimize-autoloader' -l application && \
-	su -c '/usr/local/bin/composer require zendframework/zend-ldap --working-dir=/app' -l application && \
+    su -c '/usr/local/bin/composer require zendframework/zend-ldap --working-dir=/app' -l application && \
     rm /app/.env && \
     touch /app/.env && \
     chown ${APPLICATION_UID}:${APPLICATION_GID} /app/.env
-	
+
 COPY ./50-kimai-init.sh /opt/docker/provision/entrypoint.d/50-kimai-init.sh
 
 WORKDIR /app
\ No newline at end of file
diff --git a/nginx-ubuntu-18.04/50-kimai-init.sh b/nginx-ubuntu-18.04/50-kimai-init.sh
new file mode 100644
index 0000000..8df1135
--- /dev/null
+++ b/nginx-ubuntu-18.04/50-kimai-init.sh
@@ -0,0 +1,15 @@
+#!/bin
+
+echo Refreshing .env file...
+echo APP_ENV=${APP_ENV} > /app/.env
+echo DATABASE_URL=${DATABASE_URL} >> /app/.env
+echo MAILER_FROM=${MAILER_FROM} >> /app/.env
+echo MAILER_URL=${MAILER_URL} >> /app/.env
+chown ${APPLICATION_UID}:${APPLICATION_GID} /app/.env
+
+su -c "/app/bin/console cache:clear --env=${APP_ENV} || true" -l application
+su -c "cd /app && composer install --optimize-autoloader || true" -l application
+su -c "/app/bin/console doctrine:schema:create || true" -l application
+su -c "/app/bin/console doctrine:migrations:version --add --all -n || true" -l application
+su -c "/app/bin/console cache:warmup --env=${APP_ENV} || true" -l application
+su -c "/app/bin/console kimai:create-user ${APP_ADMIN_USER} ${APP_ADMIN_EMAIL} ROLE_SUPER_ADMIN ${APP_ADMIN_PASS} --env=${APP_ENV} -vvv || true" -l application
\ No newline at end of file
diff --git a/nginx-ubuntu/Dockerfile b/nginx-ubuntu-18.04/Dockerfile
similarity index 78%
rename from nginx-ubuntu/Dockerfile
rename to nginx-ubuntu-18.04/Dockerfile
index 449e963..a836202 100644
--- a/nginx-ubuntu/Dockerfile
+++ b/nginx-ubuntu-18.04/Dockerfile
@@ -2,17 +2,17 @@ FROM webdevops/php-nginx:ubuntu-18.04
 MAINTAINER Belman Kraul <bkraul@belmankraul.com>
 
 ENV \
-	WEB_DOCUMENT_ROOT="/app/public" 
+    WEB_DOCUMENT_ROOT="/app/public" 
 
 RUN git clone https://github.com/kevinpapst/kimai2.git /app && \
     sed "s/prod/dev/g" /app/.env.dist > /app/.env && \
     chown -R ${APPLICATION_UID}:${APPLICATION_GID} /app	&& \
     su -c '/usr/local/bin/composer install --working-dir=/app --optimize-autoloader' -l application && \
-	su -c '/usr/local/bin/composer require zendframework/zend-ldap --working-dir=/app' -l application && \
+    su -c '/usr/local/bin/composer require zendframework/zend-ldap --working-dir=/app' -l application && \
     rm /app/.env && \
     touch /app/.env && \
     chown ${APPLICATION_UID}:${APPLICATION_GID} /app/.env
-	
+
 COPY ./50-kimai-init.sh /opt/docker/provision/entrypoint.d/50-kimai-init.sh
 
 WORKDIR /app
\ No newline at end of file
diff --git a/nginx-ubuntu/build b/nginx-ubuntu-18.04/build
similarity index 66%
rename from nginx-ubuntu/build
rename to nginx-ubuntu-18.04/build
index 7db3daa..1b7949c 100644
--- a/nginx-ubuntu/build
+++ b/nginx-ubuntu-18.04/build
@@ -2,6 +2,6 @@
 
 docker pull webdevops/php-nginx:ubuntu-18.04
 docker build $1\
-  -t bkraul/kimai2:nginx-ubuntu \
+  -t bkraul/kimai2:nginx-ubuntu-18.04 \
   .