diff --git a/readthedocs/doc_builder/environments.py b/readthedocs/doc_builder/environments.py
index 590678140d5..eb5002a5bd5 100644
--- a/readthedocs/doc_builder/environments.py
+++ b/readthedocs/doc_builder/environments.py
@@ -450,7 +450,15 @@ def handle_exception(self, exc_type, exc_value, _):
                           .format(project=self.project.slug,
                                   version=self.version.slug,
                                   msg=exc_value),
-                          exc_info=True)
+                          exc_info=True,
+                          extra={
+                              'stack': True,
+                              'tags': {
+                                  'build': self.build.get('id'),
+                                  'project': self.project.slug,
+                                  'version': self.version.slug,
+                              },
+                          })
                 self.failure = exc_value
             return True
 
@@ -546,8 +554,12 @@ def update_build(self, state=None):
                     str(self.failure),
                     extra={
                         'stack': True,
-                        'tags': {'build': self.build['id']},
-                    }
+                        'tags': {
+                            'build': self.build.get('id'),
+                            'project': self.project.slug,
+                            'version': self.version.slug,
+                        },
+                    },
                 )
                 self.failure = BuildEnvironmentError(
                     BuildEnvironmentError.GENERIC_WITH_BUILD_ID.format(
diff --git a/readthedocs/projects/tasks.py b/readthedocs/projects/tasks.py
index ca77ff5cf70..d781311d9eb 100644
--- a/readthedocs/projects/tasks.py
+++ b/readthedocs/projects/tasks.py
@@ -346,7 +346,14 @@ def run(self, pk, version_pk=None, build_pk=None, record=True,
         except Exception as e:  # noqa
             log.exception(
                 'An unhandled exception was raised during build setup',
-                extra={'tags': {'build': build_pk}}
+                extra={
+                    'stack': True,
+                    'tags': {
+                        'build': build_pk,
+                        'project': self.project.slug,
+                        'version': self.version.slug,
+                    },
+                },
             )
             self.setup_env.failure = BuildEnvironmentError(
                 BuildEnvironmentError.GENERIC_WITH_BUILD_ID.format(
@@ -363,7 +370,14 @@ def run(self, pk, version_pk=None, build_pk=None, record=True,
             except Exception as e:  # noqa
                 log.exception(
                     'An unhandled exception was raised during project build',
-                    extra={'tags': {'build': build_pk}}
+                    extra={
+                        'stack': True,
+                        'tags': {
+                            'build': build_pk,
+                            'project': self.project.slug,
+                            'version': self.version.slug,
+                        },
+                    },
                 )
                 self.build_env.failure = BuildEnvironmentError(
                     BuildEnvironmentError.GENERIC_WITH_BUILD_ID.format(