diff --git a/.docker/partdb-entrypoint.sh b/.docker/partdb-entrypoint.sh
index ffd2b24a..3b0326ac 100644
--- a/.docker/partdb-entrypoint.sh
+++ b/.docker/partdb-entrypoint.sh
@@ -20,6 +20,25 @@
 
 set -e
 
+# Pass all environment variables to PHP-FPM
+# Path where PHP-FPM pool configs live
+PHP_FPM_ENV_CONF="/etc/php/PHP_VERSION/fpm/pool.d/99-env.conf"
+
+# start fresh
+echo "; auto-generated env config" > "$PHP_FPM_ENV_CONF"
+echo "[www]" >> "$PHP_FPM_ENV_CONF"
+echo "clear_env = no" >> "$PHP_FPM_ENV_CONF"
+
+# add all container envs
+printenv | while IFS='=' read -r name value; do
+  case "$name" in
+    HOSTNAME|PWD|SHLVL|PATH|_*) continue ;;
+  esac
+  # write literal value in quotes
+  echo "env[$name] = \"$value\"" >> "$PHP_FPM_ENV_CONF"
+done
+
+
 # recursive chowns can take a while, so we'll just do it if the owner is wrong
 
 # Chown uploads/ folder if it does not belong to www-data
@@ -90,4 +109,4 @@ if [ "${1#-}" != "$1" ]; then
 fi
 
 # Pass to the original entrypoint
-exec "$@"
\ No newline at end of file
+exec "$@"
diff --git a/.docker/symfony.conf b/.docker/symfony.conf
index 90c30e26..aa88eef2 100644
--- a/.docker/symfony.conf
+++ b/.docker/symfony.conf
@@ -24,34 +24,6 @@
         ErrorLog ${APACHE_LOG_DIR}/error.log
         CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-        # Pass the configuration from the docker env to the PHP environment (here you should list all .env options)
-        PassEnv APP_ENV APP_DEBUG APP_SECRET REDIRECT_TO_HTTPS DISABLE_YEAR2038_BUG_CHECK
-        PassEnv TRUSTED_PROXIES TRUSTED_HOSTS LOCK_DSN
-        PassEnv DATABASE_URL ENFORCE_CHANGE_COMMENTS_FOR DATABASE_MYSQL_USE_SSL_CA DATABASE_MYSQL_SSL_VERIFY_CERT
-        PassEnv DEFAULT_LANG DEFAULT_TIMEZONE BASE_CURRENCY INSTANCE_NAME ALLOW_ATTACHMENT_DOWNLOADS USE_GRAVATAR MAX_ATTACHMENT_FILE_SIZE DEFAULT_URI CHECK_FOR_UPDATES ATTACHMENT_DOWNLOAD_BY_DEFAULT
-        PassEnv MAILER_DSN ALLOW_EMAIL_PW_RESET EMAIL_SENDER_EMAIL EMAIL_SENDER_NAME
-        PassEnv HISTORY_SAVE_CHANGED_FIELDS HISTORY_SAVE_CHANGED_DATA HISTORY_SAVE_REMOVED_DATA HISTORY_SAVE_NEW_DATA
-        PassEnv ERROR_PAGE_ADMIN_EMAIL ERROR_PAGE_SHOW_HELP
-        PassEnv DEMO_MODE NO_URL_REWRITE_AVAILABLE FIXER_API_KEY BANNER
-        # In old version the SAML sp private key env, was wrongly named SAMLP_SP_PRIVATE_KEY, keep it for backward compatibility
-        PassEnv SAML_ENABLED SAML_BEHIND_PROXY SAML_ROLE_MAPPING SAML_UPDATE_GROUP_ON_LOGIN SAML_IDP_ENTITY_ID SAML_IDP_SINGLE_SIGN_ON_SERVICE SAML_IDP_SINGLE_LOGOUT_SERVICE SAML_IDP_X509_CERT SAML_SP_ENTITY_ID SAML_SP_X509_CERT SAML_SP_PRIVATE_KEY SAMLP_SP_PRIVATE_KEY
-        PassEnv TABLE_DEFAULT_PAGE_SIZE TABLE_PARTS_DEFAULT_COLUMNS
-
-        PassEnv PROVIDER_DIGIKEY_CLIENT_ID PROVIDER_DIGIKEY_SECRET PROVIDER_DIGIKEY_CURRENCY PROVIDER_DIGIKEY_LANGUAGE PROVIDER_DIGIKEY_COUNTRY
-        PassEnv PROVIDER_ELEMENT14_KEY PROVIDER_ELEMENT14_STORE_ID
-        PassEnv PROVIDER_TME_KEY PROVIDER_TME_SECRET PROVIDER_TME_CURRENCY PROVIDER_TME_LANGUAGE PROVIDER_TME_COUNTRY PROVIDER_TME_GET_GROSS_PRICES
-        PassEnv PROVIDER_OCTOPART_CLIENT_ID PROVIDER_OCTOPART_SECRET PROVIDER_OCTOPART_CURRENCY PROVIDER_OCTOPART_COUNTRY PROVIDER_OCTOPART_SEARCH_LIMIT PROVIDER_OCTOPART_ONLY_AUTHORIZED_SELLERS
-        PassEnv PROVIDER_MOUSER_KEY PROVIDER_MOUSER_SEARCH_OPTION PROVIDER_MOUSER_SEARCH_LIMIT PROVIDER_MOUSER_SEARCH_WITH_SIGNUP_LANGUAGE
-        PassEnv PROVIDER_LCSC_ENABLED PROVIDER_LCSC_CURRENCY
-        PassEnv PROVIDER_OEMSECRETS_KEY PROVIDER_OEMSECRETS_COUNTRY_CODE PROVIDER_OEMSECRETS_CURRENCY PROVIDER_OEMSECRETS_ZERO_PRICE PROVIDER_OEMSECRETS_SET_PARAM PROVIDER_OEMSECRETS_SORT_CRITERIA
-        PassEnv PROVIDER_REICHELT_ENABLED PROVIDER_REICHELT_CURRENCY PROVIDER_REICHELT_COUNTRY PROVIDER_REICHELT_LANGUAGE PROVIDER_REICHELT_INCLUDE_VAT
-        PassEnv PROVIDER_POLLIN_ENABLED
-        PassEnv EDA_KICAD_CATEGORY_DEPTH
-        PassEnv SHOW_PART_IMAGE_OVERLAY
-
-        # Proxy configuration env
-        PassEnv NO_PROXY HTTPS_PROXY HTTP_PROXY http_proxy https_proxy ALL_PROXY all_proxy
-
         # For most configuration files from conf-available/, which are
         # enabled or disabled at a global level, it is possible to
         # include a line for only one particular virtual host. For example the
diff --git a/Dockerfile b/Dockerfile
index 13a8d5c7..cb18c78f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -119,12 +119,12 @@ realpath_cache_size=4096K
 realpath_cache_ttl=600
 EOF
 
-# Increase upload limit and enable preloading
+# Increase upload limit and enable preloading (disabled for now, as it does not seem to work properly, and require prod env anyway)
 COPY <<EOF /etc/php/${PHP_VERSION}/fpm/conf.d/partdb.ini
 upload_max_filesize=256M
 post_max_size=300M
-opcache.preload_user=www-data
-opcache.preload=/var/www/html/config/preload.php
+;opcache.preload_user=www-data
+;opcache.preload=/var/www/html/config/preload.php
 log_limit=8096
 EOF