diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 8795902..c67e0f9 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -5,8 +5,10 @@ if [ ! -z "$OSC_HOSTNAME" ]; then
   echo "Setting PUBLIC_HOST to $PUBLIC_HOST"
 
   # Extract environment from auto.{env}.osaas.io format
-  OSC_ENVIRONMENT=$(echo "$OSC_HOSTNAME" | sed 's/.*auto\.\(.*\)\.osaas\.io/\1/')
-  export OSC_ENVIRONMENT
+  if [ -z "$OSC_ENVIRONMENT" ]; then
+    OSC_ENVIRONMENT=$(echo "$OSC_HOSTNAME" | sed 's/.*auto\.\(.*\)\.osaas\.io/\1/')
+    export OSC_ENVIRONMENT
+  fi
   
   if [ -z "$OSC_ACCESS_TOKEN" ]; then
     echo "OSC_ACCESS_TOKEN is not set. Limited functionality will be available."
diff --git a/package-lock.json b/package-lock.json
index f4b555f..f7eada0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "@fastify/type-provider-typebox": "^5.1.0",
         "@sinclair/typebox": "^0.32.35",
         "dotenv": "^16.5.0",
-        "fastify": "^5.7.3",
+        "fastify": "^5.8.5",
         "mongodb": "^6.16.0",
         "nano": "^10.1.4",
         "nodemon": "^3.1.10",
@@ -3721,9 +3721,9 @@
       ]
     },
     "node_modules/fastify": {
-      "version": "5.7.4",
-      "resolved": "https://registry.npmjs.org/fastify/-/fastify-5.7.4.tgz",
-      "integrity": "sha512-e6l5NsRdaEP8rdD8VR0ErJASeyaRbzXYpmkrpr2SuvuMq6Si3lvsaVy5C+7gLanEkvjpMDzBXWE5HPeb/hgTxA==",
+      "version": "5.8.5",
+      "resolved": "https://registry.npmjs.org/fastify/-/fastify-5.8.5.tgz",
+      "integrity": "sha512-Yqptv59pQzPgQUSIm87hMqHJmdkb1+GPxdE6vW6FRyVE9G86mt7rOghitiU4JHRaTyDUk9pfeKmDeu70lAwM4Q==",
       "funding": [
         {
           "type": "github",
@@ -3734,6 +3734,7 @@
           "url": "https://opencollective.com/fastify"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "@fastify/ajv-compiler": "^4.0.5",
         "@fastify/error": "^4.0.0",
@@ -3744,7 +3745,7 @@
         "fast-json-stringify": "^6.0.0",
         "find-my-way": "^9.0.0",
         "light-my-request": "^6.0.0",
-        "pino": "^10.1.0",
+        "pino": "^9.14.0 || ^10.1.0",
         "process-warning": "^5.0.0",
         "rfdc": "^1.3.1",
         "secure-json-parse": "^4.0.0",
diff --git a/package.json b/package.json
index d1de7e9..ab4fd30 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@fastify/type-provider-typebox": "^5.1.0",
     "@sinclair/typebox": "^0.32.35",
     "dotenv": "^16.5.0",
-    "fastify": "^5.7.3",
+    "fastify": "^5.8.5",
     "mongodb": "^6.16.0",
     "nano": "^10.1.4",
     "nodemon": "^3.1.10",
diff --git a/src/api_productions.ts b/src/api_productions.ts
index 2914c64..d4ac6d0 100644
--- a/src/api_productions.ts
+++ b/src/api_productions.ts
@@ -1,5 +1,4 @@
 import { Type } from '@sinclair/typebox';
-import dotenv from 'dotenv';
 import { FastifyPluginCallback } from 'fastify';
 import { v4 as uuidv4 } from 'uuid';
 import { CoreFunctions } from './api_productions_core_functions';
@@ -26,7 +25,6 @@ import {
 } from './models';
 import { ProductionManager } from './production_manager';
 import { ISmbProtocol, SmbProtocol } from './smb';
-dotenv.config();
 
 export interface ApiProductionsOptions {
   smbServerBaseUrl: string;