diff --git a/plane/plane-tests/tests/docker_command.rs b/plane/plane-tests/tests/docker_command.rs
index e6dad0e1a..44f427440 100644
--- a/plane/plane-tests/tests/docker_command.rs
+++ b/plane/plane-tests/tests/docker_command.rs
@@ -103,7 +103,7 @@ async fn test_resource_limits() {
     }
 
     let mut config = get_container_config_from_executor_config(
-        &backend_name,
+        Some(&backend_name),
         executor_config.clone(),
         None,
         None,
diff --git a/plane/src/drone/runtime/docker/commands.rs b/plane/src/drone/runtime/docker/commands.rs
index eb5f408f1..2c4f2da85 100644
--- a/plane/src/drone/runtime/docker/commands.rs
+++ b/plane/src/drone/runtime/docker/commands.rs
@@ -136,7 +136,7 @@ pub fn validate_mount_path(path: &Path) -> Result<()> {
 }
 
 pub fn get_container_config_from_executor_config(
-    backend_id: &BackendName,
+    backend_id: Option<&BackendName>,
     exec_config: DockerExecutorConfig,
     runtime: Option<&str>,
     key: Option<&AcquiredKey>,
@@ -146,7 +146,10 @@ pub fn get_container_config_from_executor_config(
 ) -> Result<bollard::container::Config<String>> {
     let mut env = exec_config.env;
     env.insert("PORT".to_string(), CONTAINER_PORT.to_string());
-    env.insert("SESSION_BACKEND_ID".to_string(), backend_id.to_string());
+
+    if let Some(backend_id) = backend_id {
+        env.insert("SESSION_BACKEND_ID".to_string(), backend_id.to_string());
+    }
 
     if let Some(key) = key {
         env.insert(
@@ -205,7 +208,7 @@ pub fn get_container_config_from_executor_config(
 
     Ok(bollard::container::Config {
         image: Some(exec_config.image.clone()),
-        labels: Some(create_labels(backend_id)),
+        labels: backend_id.map(create_labels),
         env: Some(env),
         exposed_ports: Some(
             vec![(format!("{}/tcp", CONTAINER_PORT), HashMap::new())]
@@ -271,7 +274,7 @@ pub async fn run_container(
     };
 
     let config = get_container_config_from_executor_config(
-        backend_id,
+        Some(backend_id),
         exec_config,
         docker.config.runtime.as_deref(),
         acquired_key,
@@ -328,7 +331,7 @@ mod tests {
         exec_config.mount = mount;
 
         get_container_config_from_executor_config(
-            &backend_name,
+            Some(&backend_name),
             exec_config,
             None,
             acquired_key.as_ref(),
@@ -361,7 +364,7 @@ mod tests {
         exec_config.network_name = network_name.map(|n| n.to_string());
 
         get_container_config_from_executor_config(
-            &backend_name,
+            Some(&backend_name),
             exec_config,
             None,
             acquired_key.as_ref(),
diff --git a/plane/src/drone/runtime/docker/mod.rs b/plane/src/drone/runtime/docker/mod.rs
index 98ca86fcb..33acd00bd 100644
--- a/plane/src/drone/runtime/docker/mod.rs
+++ b/plane/src/drone/runtime/docker/mod.rs
@@ -64,7 +64,7 @@ pub struct DockerRuntimeConfig {
 pub type MetricsCallback = Box<dyn Fn(BackendMetricsMessage) + Send + Sync + 'static>;
 
 pub struct DockerRuntime {
-    docker: Docker,
+    pub docker: Docker,
     config: DockerRuntimeConfig,
     metrics_callback: Arc<Mutex<Option<MetricsCallback>>>,
     events_sender: Sender<TerminateEvent>,