diff --git a/configuration/sample-development.engine.ini b/configuration/sample-development.engine.ini
index fef3d30db65a425884b2fb7baca3e3687cf9a4ac..2022d7b96253fc3e814db255c543565cc7abc484 100644
--- a/configuration/sample-development.engine.ini
+++ b/configuration/sample-development.engine.ini
@@ -48,31 +48,33 @@ loglevel="info"
 ## STEERING ##
 
 # The URL to get the health status 
-api_steering_status = "http://localhost:8000/api/v1/"
+api_steering_status="http://localhost:8000/api/v1/"
 # The URL to get the Calendar via Steering
 api_steering_calendar="http://localhost:8000/api/v1/playout"
-# The URL to get show details via Steering
-api_steering_show="http://localhost:8000/api/v1/shows/${ID}/"
 
 ## TANK ##
 
+# The session name which is used to authenticate against Tank
+api_tank_session="engine"
+# The secret which is used to authenticate against Tank
+api_tank_secret="rather-secret"
 # The URL to get the health status 
-api_tank_status = "http://localhost:8040/healthz/"
+api_tank_status="http://localhost:8040/healthz/"
 # The URL to get playlist details via Tank
 api_tank_playlist="http://localhost:8040/api/v1/playlists/${ID}"
 
 ## ENGINE-API ##
 
 # Engine ID (1 or 2)
-api_engine_number = 1
+api_engine_number=1
 # Engine API availability check
 api_engine_status="http://localhost:8008/api/v1/ui/"
 # Engine API endpoint to store playlogs
-api_engine_store_playlog = "http://localhost:8008/api/v1/playlog/store"
+api_engine_store_playlog="http://localhost:8008/api/v1/playlog/store"
 # Engine API endpoint to store clock information
-api_engine_store_clock = "http://localhost:8008/api/v1/clock"
+api_engine_store_clock="http://localhost:8008/api/v1/clock"
 # Engine API endpoint to store health information
-api_engine_store_health = "http://localhost:8008/api/v1/source/health/${ENGINE_NUMBER}"
+api_engine_store_health="http://localhost:8008/api/v1/source/health/${ENGINE_NUMBER}"
 
 
 [scheduling]
diff --git a/configuration/sample-docker.engine.ini b/configuration/sample-docker.engine.ini
index 1d3b96f08e5f8147ad7fa5e446480d8ae568393a..565e0428de1cf37b2e4a74d7cbb5e3ddaf3357ff 100644
--- a/configuration/sample-docker.engine.ini
+++ b/configuration/sample-docker.engine.ini
@@ -48,31 +48,33 @@ loglevel="info"
 ## STEERING ##
 
 # The URL to get the health status 
-api_steering_status = "http://127.0.0.1:8000/api/v1/"
+api_steering_status="http://127.0.0.1:8000/api/v1/"
 # The URL to get the Calendar via Steering
 api_steering_calendar="http://127.0.0.1:8000/api/v1/playout"
-# The URL to get show details via Steering
-api_steering_show="http://127.0.0.1:8000/api/v1/shows/${ID}/"
 
 ## TANK ##
 
+# The session name which is used to authenticate against Tank
+api_tank_session="engine"
+# The secret which is used to authenticate against Tank
+api_tank_secret="rather-secret"
 # The URL to get the health status 
-api_tank_status = "http://127.0.0.1:8040/healthz/"
+api_tank_status="http://127.0.0.1:8040/healthz/"
 # The URL to get playlist details via Tank
 api_tank_playlist="http://127.0.0.1:8040/api/v1/playlists/${ID}"
 
 ## ENGINE-API ##
 
 # Engine ID (1 or 2)
-api_engine_number = 1
+api_engine_number=1
 # Engine API availability check
-api_engine_status="http://localhost:8008/api/v1/ui/"
+api_engine_status="http://127.0.0.1:8008/api/v1/ui/"
 # Engine API endpoint to store playlogs
-api_engine_store_playlog = "http://localhost:8008/api/v1/playlog/store"
+api_engine_store_playlog="http://127.0.0.1:8008/api/v1/playlog/store"
 # Engine API endpoint to store clock information
-api_engine_store_clock = "http://localhost:8008/api/v1/clock"
+api_engine_store_clock="http://127.0.0.1:8008/api/v1/clock"
 # Engine API endpoint to store health information
-api_engine_store_health = "http://localhost:8008/api/v1/source/health/${ENGINE_NUMBER}"
+api_engine_store_health="http://127.0.0.1:8008/api/v1/source/health/${ENGINE_NUMBER}"
 
 
 [scheduling]
diff --git a/configuration/sample-production.engine.ini b/configuration/sample-production.engine.ini
index 9dc1c4bd5407c528c84db4dc48916310968c9c60..4733ac08f912a30bd024671117d19f15e436ca5d 100644
--- a/configuration/sample-production.engine.ini
+++ b/configuration/sample-production.engine.ini
@@ -45,32 +45,36 @@ loglevel="info"
 
 [api]
 
+## STEERING ##
+
 # The URL to get the health status 
-api_steering_status = "http://aura.local:8000/api/v1/"
+api_steering_status="http://aura.local:8000/api/v1/"
 # The URL to get the Calendar via Steering
 api_steering_calendar="http://aura.local:8000/api/v1/playout"
-# The URL to get show details via Steering
-api_steering_show="http://aura.local:8000/api/v1/shows/${ID}/"
 
 ## TANK ##
 
+# The session name which is used to authenticate against Tank
+api_tank_session="engine"
+# The secret which is used to authenticate against Tank
+api_tank_secret="rather-secret"
 # The URL to get the health status 
-api_tank_status = "http://aura.local:8040/healthz/"
+api_tank_status="http://aura.local:8040/healthz/"
 # The URL to get playlist details via Tank
 api_tank_playlist="http://aura.local:8040/api/v1/playlists/${ID}"
 
 ## ENGINE-API ##
 
 # Engine ID (1 or 2)
-api_engine_number = 1
+api_engine_number=1
 # Engine API availability check
 api_engine_status="http://localhost:8008/api/v1/ui/"
 # Engine API endpoint to store playlogs
-api_engine_store_playlog = "http://localhost:8008/api/v1/playlog/store"
+api_engine_store_playlog="http://localhost:8008/api/v1/playlog/store"
 # Engine API endpoint to store clock information
-api_engine_store_clock = "http://localhost:8008/api/v1/clock"
+api_engine_store_clock="http://localhost:8008/api/v1/clock"
 # Engine API endpoint to store health information
-api_engine_store_health = "http://localhost:8008/api/v1/source/health/${ENGINE_NUMBER}"
+api_engine_store_health="http://localhost:8008/api/v1/source/health/${ENGINE_NUMBER}"
 
 
 [scheduling]