diff --git a/Makefile b/Makefile
index 18a072e0d..12697938e 100644
--- a/Makefile
+++ b/Makefile
@@ -163,6 +163,8 @@ starter: generate-secrets
 ## Make a local site with codebase directory bind mounted, using cloned starter site.
 starter_dev: QUOTED_CURDIR = "$(CURDIR)"
 starter_dev: generate-secrets
+
+	-include dev.env
 	$(MAKE) starter-init ENVIRONMENT=starter_dev
 	if [ -z "$$(ls -A $(QUOTED_CURDIR)/codebase)" ]; then \
 		docker container run --rm -v $(CURDIR)/codebase:/home/root $(REPOSITORY)/nginx:$(TAG) with-contenv bash -lc 'git clone -b main https://github.com/Islandora-Devops/islandora-starter-site /home/root;'; \
diff --git a/build/docker-compose/docker-compose.drupal.yml b/build/docker-compose/docker-compose.drupal.yml
index 52b3f0bea..8f7a2fb7b 100644
--- a/build/docker-compose/docker-compose.drupal.yml
+++ b/build/docker-compose/docker-compose.drupal.yml
@@ -21,6 +21,20 @@ services:
       PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE}
       PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE}
       PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME}
+      PHP_MAX_INPUT_TIME: ${PHP_MAX_INPUT_TIME}
+      PHP_DEFAULT_SOCKET_TIMEOUT: ${PHP_DEFAULT_SOCKET_TIMEOUT}
+      PHP_PROCESS_CONTROL_TIMEOUT: ${PHP_PROCESS_CONTROL_TIMEOUT}
+      PHP_REQUEST_TERMINATE_TIMEOUT: ${PHP_REQUEST_TERMINATE_TIMEOUT}
+      NGINX_CLIENT_BODY_TIMEOUT: ${NGINX_CLIENT_BODY_TIMEOUT}
+      NGINX_FASTCGI_CONNECT_TIMEOUT: ${NGINX_FASTCGI_CONNECT_TIMEOUT}
+      NGINX_FASTCGI_READ_TIMEOUT: ${NGINX_FASTCGI_READ_TIMEOUT}
+      NGINX_FASTCGI_SEND_TIMEOUT: ${NGINX_FASTCGI_SEND_TIMEOUT}
+      NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT}
+      NGINX_LINGERING_TIMEOUT: ${NGINX_LINGERING_TIMEOUT}
+      NGINX_PROXY_CONNECT_TIMEOUT: ${NGINX_PROXY_CONNECT_TIMEOUT}
+      NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT}
+      NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT}
+      NGINX_SEND_TIMEOUT: ${NGINX_SEND_TIMEOUT}
     labels:
       - traefik.enable=${EXPOSE_DRUPAL:-true}
       - traefik.http.services.${COMPOSE_PROJECT_NAME-isle-dc}-drupal.loadbalancer.server.port=80
@@ -41,4 +55,4 @@ services:
           limits:
             memory: ${DRUPAL_MEMORY_LIMIT:-512M}
           reservations:
-            memory: 256M
\ No newline at end of file
+            memory: 256M
diff --git a/dev.env b/dev.env
new file mode 100644
index 000000000..3737f532d
--- /dev/null
+++ b/dev.env
@@ -0,0 +1,14 @@
+PHP_MAX_INPUT_TIME=3600
+PHP_DEFAULT_SOCKET_TIMEOUT=3600
+PHP_PROCESS_CONTROL_TIMEOUT=3600
+PHP_REQUEST_TERMINATE_TIMEOUT=3600
+NGINX_CLIENT_BODY_TIMEOUT=3600s
+NGINX_FASTCGI_CONNECT_TIMEOUT=3600s
+NGINX_FASTCGI_READ_TIMEOUT=3600s
+NGINX_FASTCGI_SEND_TIMEOUT=3600s
+NGINX_KEEPALIVE_TIMEOUT=3600s
+NGINX_LINGERING_TIMEOUT=5s
+NGINX_PROXY_CONNECT_TIMEOUT=3600s
+NGINX_PROXY_READ_TIMEOUT=3600s
+NGINX_PROXY_SEND_TIMEOUT=3600s
+NGINX_SEND_TIMEOUT=3600s
diff --git a/sample.env b/sample.env
index 858655b50..84bade4d2 100644
--- a/sample.env
+++ b/sample.env
@@ -134,7 +134,7 @@ EXPOSE_ACTIVEMQ=false
 ACTIVEMQ_PORT=8161
 
 # Expose SOLR over the given port - DO NOT EXPOSE THIS IN PRODUCTION
-EXPOSE_SOLR=false
+EXPOSE_SOLR=true
 SOLR_PORT=8983
 
 # Expose Code Server over the given port - DO NOT EXPOSE THIS IN PRODUCTION
@@ -203,3 +203,20 @@ CANTALOUPE_HTTPSOURCE_LOOKUP_STRATEGY=BasicLookupStrategy
 #   when running make drupal-public-files-import
 # If set to anything else, that path will be added to DEST
 PUBLIC_FILES_TAR_DUMP_PATH=.
+
+
+PHP_MAX_EXECUTION_TIME=30
+PHP_MAX_INPUT_TIME=60
+PHP_DEFAULT_SOCKET_TIMEOUT=60
+PHP_PROCESS_CONTROL_TIMEOUT=60
+PHP_REQUEST_TERMINATE_TIMEOUT=60
+NGINX_CLIENT_BODY_TIMEOUT=60s
+NGINX_FASTCGI_CONNECT_TIMEOUT=60s
+NGINX_FASTCGI_READ_TIMEOUT=60s
+NGINX_FASTCGI_SEND_TIMEOUT=60s
+NGINX_KEEPALIVE_TIMEOUT=60s
+NGINX_LINGERING_TIMEOUT=5s
+NGINX_PROXY_CONNECT_TIMEOUT=60s
+NGINX_PROXY_READ_TIMEOUT=60s
+NGINX_PROXY_SEND_TIMEOUT=60s
+NGINX_SEND_TIMEOUT=60s