diff --git a/Dockerfile b/Dockerfile
index 3b3f1a0..ef0821d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -84,7 +84,8 @@ ADD ./container_files /opt
 # Add Volumes and Set permissions
 RUN mkdir /opt/shared \
     && chmod 777 /opt/shared \
-    && chmod 777 /opt/bin/*.sh
+    && chmod +x /opt/bin/*.sh \
+    && chmod +x /opt/autoexec/bin/*.sh
 
 # Environment variables
 ENV ADMIN_NAME "Scott"
@@ -114,7 +115,19 @@ VOLUME /opt/shibboleth/ssl/
 VOLUME /opt/httpd/ssl/
 
 #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 && ln -s /opt/comanage/comanage-registry-1.0.5/app/webroot /var/www/html/registry && rm /etc/httpd/conf/httpd.conf && ln -s /opt/etc/httpd/conf/httpd.conf /etc/httpd/conf/httpd.conf
+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 && \
+    ln -s /opt/comanage/comanage-registry-1.0.5/app/webroot /var/www/html/registry && \
+    rm /etc/httpd/conf/httpd.conf && \
+    ln -s /opt/etc/httpd/conf/httpd.conf /etc/httpd/conf/httpd.conf
   
 # Port
 EXPOSE 80 443
diff --git a/tests/image.bats b/tests/image.bats
index 616708f..ba27768 100644
--- a/tests/image.bats
+++ b/tests/image.bats
@@ -27,3 +27,8 @@ load ../common
 @test "Autoexec onbuild capability detected" {
   docker run -i $maintainer/$imagename find /opt/autoexec/bin/onbuild.sh
 }
+
+@test "Autoexec firstrun retains executability" {
+  skip
+  docker run -i $maintainer/$imagename ls -la /opt/autoexec/bin/firstrun.sh
+}