diff --git a/azure-quantum/azure/quantum/job/base_job.py b/azure-quantum/azure/quantum/job/base_job.py
index f55b1ae99..4339c3305 100644
--- a/azure-quantum/azure/quantum/job/base_job.py
+++ b/azure-quantum/azure/quantum/job/base_job.py
@@ -59,7 +59,14 @@ def details(self, value: JobDetails):
     @property
     def container_name(self):
         """Job input/output data container name"""
-        return f"job-{self.id}"
+
+        if self._details.container_uri is None:
+            return  f"job-{self.id}"
+        else:
+            container_uri = self._details.container_uri
+        path = urlparse(container_uri).path
+        container_name = path.split("/")[1]
+        return container_name
 
     @classmethod
     def from_input_data(
@@ -323,7 +330,10 @@ def upload_attachment(
 
         # Use Job's default container if not specified
         if container_uri is None:
-            container_uri = self.workspace.get_container_uri(job_id=self.id)
+            if self._details.container_uri is None:
+                container_uri = self.workspace.get_container_uri(job_id=self.id)
+            else:
+                container_uri = self._details.container_uri
 
         uploaded_blob_uri = self.upload_input_data(
             container_uri = container_uri,
@@ -353,7 +363,10 @@ def download_attachment(
 
         # Use Job's default container if not specified
         if container_uri is None:
-            container_uri = self.workspace.get_container_uri(job_id=self.id)
+            if self._details.container_uri is None:
+                container_uri = self.workspace.get_container_uri(job_id=self.id)
+            else:
+                container_uri = self._details.container_uri
         
         container_client = ContainerClient.from_container_url(container_uri)
         blob_client = container_client.get_blob_client(name)