diff --git a/awx/main/analytics/core.py b/awx/main/analytics/core.py
index c551c3d992..fb979ded10 100644
--- a/awx/main/analytics/core.py
+++ b/awx/main/analytics/core.py
@@ -85,20 +85,29 @@ def package(target, data, timestamp):
         manifest = {}
         with tarfile.open(target.joinpath(tarname), 'w:gz') as f:
             for name, (item, version) in data.items():
-                manifest[name] = version
-                if isinstance(item, str):
-                    info = f.gettarinfo(item, arcname=name)
-                    f.addfile(info)
-                else:
-                    info = tarfile.TarInfo(name)
-                    fileobj = io.BytesIO(json.dumps(item).encode('utf-8'))
-                    fileobj.size = len(fileobj.getvalue())
-                    f.addfile(info, fileobj=fileobj)
+                try:
+                    if isinstance(item, str):
+                        info = f.gettarinfo(item, arcname=f'./{name}')
+                        f.addfile(info)
+                    else:
+                        fileobj = io.BytesIO(json.dumps(item).encode('utf-8'))
+                        info = tarfile.TarInfo(f'./{name}')
+                        info.size = len(fileobj.getvalue())
+                        info.mtime = timestamp.timestamp()
+                        f.addfile(info, fileobj=fileobj)
+                    manifest[name] = version
+                except Exception:
+                    logger.exception(f"Could not generate metric {name}")
 
-            info = tarfile.TarInfo('manifest.json')
-            fileobj = io.BytesIO(json.dumps(manifest).encode('utf-8'))
-            fileobj.size = len(fileobj.getvalue())
-            f.addfile(info, fileobj=fileobj)
+            try:
+                fileobj = io.BytesIO(json.dumps(manifest).encode('utf-8'))
+                info = tarfile.TarInfo('./manifest.json')
+                info.size = len(fileobj.getvalue())
+                info.mtime = timestamp.timestamp()
+                f.addfile(info, fileobj=fileobj)
+            except Exception:
+                logger.exception("Could not generate manifest.json")
+                return None
 
         return f.name
     except Exception:
diff --git a/awx/main/tests/functional/analytics/test_core.py b/awx/main/tests/functional/analytics/test_core.py
index dbb819a87f..e37f30d26b 100644
--- a/awx/main/tests/functional/analytics/test_core.py
+++ b/awx/main/tests/functional/analytics/test_core.py
@@ -39,7 +39,7 @@ def mock_valid_license():
 def test_gather(mock_valid_license):
     settings.INSIGHTS_TRACKING_STATE = True
 
-    tgzfiles = gather(module=importlib.import_module(__name__))
+    tgzfiles = gather(module=importlib.import_module(__name__), collection_type='dry-run')
     files = {}
     with tarfile.open(tgzfiles[0], "r:gz") as archive:
         for member in archive.getmembers():