diff --git a/Dockerfile b/Dockerfile
index b1527f8..1b81d59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -98,17 +98,8 @@ VOLUME /opt/shibboleth/ssl/
 # Required volumes for mounting Apache SSL files into container
 VOLUME /opt/httpd/ssl/
 
-#Add httpd configuration
-RUN ln -s /opt/etc/httpd/conf.d/ports.conf /etc/httpd/conf.d/ports.conf
-RUN ln -s /opt/etc/httpd/conf.d/handlers.conf /etc/httpd/conf.d/handlers.conf
-RUN ln -s /opt/etc/httpd/conf.d/virtual_host_80.conf /etc/httpd/conf.d/00-comanage-80.conf
-
-#Add php Configuration
-RUN ln -s /opt/etc/php/EmailSheel.php  /opt/comanage/comanage-registry-$version/app/Console/Command/EmailSheel.php
-RUN ln -s /opt/etc/php/database.php  /opt/comanage/comanage-registry-$version/local/Config/database.php
-RUN rm -f /opt/comanage/comanage-registry-$version/app/Config/database.php && ln -s /opt/etc/php/database.php  /opt/comanage/comanage-registry-$version/app/Config/database.php
-RUN ln -s /opt/etc/php/email.php  /opt/comanage/comanage-registry-$version/local/Config/email.php
-RUN rm -f /opt/comanage/comanage-registry-$version/app/Config/email.php &&  ln -s /opt/etc/php/email.php  /opt/comanage/comanage-registry-$version/app/Config/email.php
+#Add httpd and php configuration
+RUN ln -s /opt/etc/httpd/conf.d/ports.conf /etc/httpd/conf.d/ports.conf &&  ln -s /opt/etc/httpd/conf.d/handlers.conf /etc/httpd/conf.d/handlers.conf &&  ln -s /opt/etc/httpd/conf.d/virtual_host_80.conf /etc/httpd/conf.d/00-comanage-80.conf && ln -s /opt/etc/php/EmailSheel.php  /opt/comanage/comanage-registry-$version/app/Console/Command/EmailSheel.php && ln -s /opt/etc/php/database.php  /opt/comanage/comanage-registry-$version/local/Config/database.php && rm -f /opt/comanage/comanage-registry-$version/app/Config/database.php && ln -s /opt/etc/php/database.php  /opt/comanage/comanage-registry-$version/app/Config/database.php && ln -s /opt/etc/php/email.php  /opt/comanage/comanage-registry-$version/local/Config/email.php &&  rm -f /opt/comanage/comanage-registry-$version/app/Config/email.php &&  ln -s /opt/etc/php/email.php  /opt/comanage/comanage-registry-$version/app/Config/email.php
 
 # Port
 EXPOSE 80 443