diff --git a/.env b/.env
index 2a347b23..3bb7b21b 100755
--- a/.env
+++ b/.env
@@ -49,15 +49,22 @@ DOCKER_API_VERSION=1.40
 # Orborus/Proxy configurations  
 HTTP_PROXY=
 HTTPS_PROXY=
-SHUFFLE_PASS_WORKER_PROXY=TRUE 			# Decides if proxy configurations should be passed to workers or not
-SHUFFLE_PASS_APP_PROXY=TRUE 		# Decides if proxy configurations should be passed to apps or not. Requires SHUFFLE_PASS_WORKER_PROXY=true
-SHUFFLE_INTERNAL_HTTP_PROXY= 		# Used to differentiate proxies for shuffle internal vs external traffic
+# Decides if proxy configurations should be passed to workers or not
+SHUFFLE_PASS_WORKER_PROXY=TRUE
+# Decides if proxy configurations should be passed to apps or not. Requires SHUFFLE_PASS_WORKER_PROXY=true
+SHUFFLE_PASS_APP_PROXY=TRUE
+# Used to differentiate proxies for shuffle internal vs external traffic
+SHUFFLE_INTERNAL_HTTP_PROXY=
 SHUFFLE_INTERNAL_HTTPS_PROXY=
-TZ=Europe/Amsterdam 					# Timezone-handler in Orborus, Worker and Apps
-ORBORUS_CONTAINER_NAME=				# Used to FIND the containername. cgroup v2: issue 501
-SHUFFLE_ORBORUS_STARTUP_DELAY= 		# Used for setting up a startup delay for Orborus
-SHUFFLE_SKIPSSL_VERIFY=true 		
-IS_KUBERNETES=false 				# Used for controlling if the environment should run in kubernetes or not
+# Timezone-handler in Orborus, Worker and Apps
+TZ=Europe/Amsterdam
+# Used to FIND the containername. cgroup v2: issue 501
+ORBORUS_CONTAINER_NAME=
+# Used for setting up a startup delay for Orborus
+SHUFFLE_ORBORUS_STARTUP_DELAY=
+SHUFFLE_SKIPSSL_VERIFY=true
+# Used for controlling if the environment should run in kubernetes or not
+IS_KUBERNETES=false
 
 SHUFFLE_BASE_IMAGE_NAME=shuffle
 SHUFFLE_BASE_IMAGE_REGISTRY=ghcr.io
@@ -67,22 +74,27 @@ SHUFFLE_BASE_IMAGE_TAG_SUFFIX="-1.3.1"
 # The eth0 interface inside a container corresponds 
 # to the virtual Ethernet interface that connects 
 # the container to the docker0 
-SHUFFLE_SWARM_BRIDGE_DEFAULT_INTERFACE=eth0 
-SHUFFLE_SWARM_BRIDGE_DEFAULT_MTU=1500 # 1500 by default
+SHUFFLE_SWARM_BRIDGE_DEFAULT_INTERFACE=eth0
+# 1500 by default
+SHUFFLE_SWARM_BRIDGE_DEFAULT_MTU=1500
 
 # Used for auto-cleanup of containers. REALLY important at scale. Set to false to see all container info.
 SHUFFLE_MEMCACHED=
 SHUFFLE_CONTAINER_AUTO_CLEANUP=true
-SHUFFLE_ORBORUS_EXECUTION_CONCURRENCY=5 # The amount of concurrent executions Orborus can handle. This is a soft limit, but it's recommended to keep it low.
+# The amount of concurrent executions Orborus can handle. This is a soft limit, but it's recommended to keep it low.
+SHUFFLE_ORBORUS_EXECUTION_CONCURRENCY=5
 SHUFFLE_HEALTHCHECK_DISABLED=false 
 SHUFFLE_ELASTIC=true
 SHUFFLE_LOGS_DISABLED=false
-SHUFFLE_CHAT_DISABLED=false 	# Controls support chat
+SHUFFLE_CHAT_DISABLED=false
 SHUFFLE_DISABLE_RERUN_AND_ABORT=false
 SHUFFLE_RERUN_SCHEDULE=300
-SHUFFLE_WORKER_SERVER_URL= 		# Definition in case Worker & Orborus is talking to the wrong server
-SHUFFLE_ORBORUS_PULL_TIME= 		# Definition in case Orborus is pulling too often/not often enough
-SHUFFLE_MAX_EXECUTION_DEPTH= 	# Max recursion depth for subflows
+# Definition in case Worker & Orborus is talking to the wrong server
+SHUFFLE_WORKER_SERVER_URL=
+# Definition in case Orborus is pulling too often/not often enough
+SHUFFLE_ORBORUS_PULL_TIME=
+# Max recursion depth for subflows
+SHUFFLE_MAX_EXECUTION_DEPTH=
 
 # DATABASE CONFIGURATIONS
 DATASTORE_EMULATOR_HOST=shuffle-database:8000