diff --git a/grocy/rootfs/etc/services.d/php-fpm/run b/grocy/rootfs/etc/services.d/php-fpm/run
index d703fa5..5974f80 100644
--- a/grocy/rootfs/etc/services.d/php-fpm/run
+++ b/grocy/rootfs/etc/services.d/php-fpm/run
@@ -5,80 +5,98 @@
 # ==============================================================================
 declare caldayweek
 declare mealday
+export GROCY_CALENDAR_FIRST_DAY_OF_WEEK=0
 export GROCY_CULTURE
 export GROCY_CURRENCY
 export GROCY_ENTRY_PAGE
+export GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS=1
+export GROCY_FEATURE_FLAG_BATTERIES=1
+export GROCY_FEATURE_FLAG_CALENDAR=1
+export GROCY_FEATURE_FLAG_CHORES=1
+export GROCY_FEATURE_FLAG_EQUIPMENT=1
+export GROCY_FEATURE_FLAG_RECIPES=1
+export GROCY_FEATURE_FLAG_SHOPPINGLIST=1
+export GROCY_FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS=1
+export GROCY_FEATURE_FLAG_STOCK=1
+export GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING=1
+export GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING=1
+export GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING=1
+export GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING=1
+export GROCY_FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING=1
+export GROCY_FEATURE_FLAG_TASKS=1
+export GROCY_MEAL_PLAN_FIRST_DAY_OF_WEEK=0
+
 
 bashio::log.info "Starting PHP-FPM..."
 
 if bashio::config.false 'features.batteries'; then
-    export GROCY_FEATURE_FLAG_BATTERIES=0
+    GROCY_FEATURE_FLAG_BATTERIES=0
 fi
 
 if bashio::config.false 'features.calendar'; then
-    export GROCY_FEATURE_FLAG_CALENDAR=0
+    GROCY_FEATURE_FLAG_CALENDAR=0
 fi
 
 if bashio::config.false 'features.chores'; then
-    export GROCY_FEATURE_FLAG_CHORES=0
+    GROCY_FEATURE_FLAG_CHORES=0
 fi
 
 if bashio::config.false 'features.equipment'; then
-    export GROCY_FEATURE_FLAG_EQUIPMENT=0
+    GROCY_FEATURE_FLAG_EQUIPMENT=0
 fi
 
 if bashio::config.false 'features.recipes'; then
-    export GROCY_FEATURE_FLAG_RECIPES=0
+    GROCY_FEATURE_FLAG_RECIPES=0
 fi
 
 if bashio::config.false 'features.shoppinglist'; then
-    export GROCY_FEATURE_FLAG_SHOPPINGLIST=0
+    GROCY_FEATURE_FLAG_SHOPPINGLIST=0
 fi
 
 if bashio::config.false 'features.stock'; then
-    export GROCY_FEATURE_FLAG_STOCK=0
+    GROCY_FEATURE_FLAG_STOCK=0
 fi
 
 if bashio::config.false 'features.tasks'; then
-    export GROCY_FEATURE_FLAG_TASKS=0
+    GROCY_FEATURE_FLAG_TASKS=0
 fi
 
 if bashio::config.has_value 'tweaks.calendar_first_day_of_week'; then
     caldayweek=$(bashio::config 'tweaks.calendar_first_day_of_week')
-    export GROCY_CALENDAR_FIRST_DAY_OF_WEEK=${caldayweek}
+    GROCY_CALENDAR_FIRST_DAY_OF_WEEK=${caldayweek}
 fi
 
 if bashio::config.false 'tweaks.chores_assignment'; then
-    export GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS=0
+    GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS=0
 fi
 
 if bashio::config.has_value 'tweaks.meal_plan_first_day_of_week'; then
     mealday=$(bashio::config 'tweaks.meal_plan_first_day_of_week')
-    export GROCY_MEAL_PLAN_FIRST_DAY_OF_WEEK=${mealday}
+    GROCY_MEAL_PLAN_FIRST_DAY_OF_WEEK=${mealday}
 fi
 
 if bashio::config.false 'tweaks.multiple_shopping_lists'; then
-    export GROCY_FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS=0
+    GROCY_FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS=0
 fi
 
 if bashio::config.false 'tweaks.stock_best_before_date_tracking'; then
-    export GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING=0
+    GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING=0
 fi
 
 if bashio::config.false 'tweaks.stock_location_tracking'; then
-    export GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING=0
+    GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING=0
 fi
 
 if bashio::config.false 'tweaks.stock_price_tracking'; then
-    export GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING=0
+    GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING=0
 fi
 
 if bashio::config.false 'tweaks.stock_product_freezing'; then
-    export GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING=0
+    GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING=0
 fi
 
 if bashio::config.false 'tweaks.stock_product_opened_tracking'; then
-    export GROCY_FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING=0
+    GROCY_FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING=0
 fi
 
 GROCY_CULTURE=$(bashio::config "culture")