diff --git a/.autover/changes/e52deae1-471a-4119-b874-5ef0ccf690b3.json b/.autover/changes/e52deae1-471a-4119-b874-5ef0ccf690b3.json
new file mode 100644
index 0000000..c01ebc1
--- /dev/null
+++ b/.autover/changes/e52deae1-471a-4119-b874-5ef0ccf690b3.json
@@ -0,0 +1,11 @@
+{
+  "Projects": [
+    {
+      "Name": "Amazon.Lambda.Tools",
+      "Type": "Patch",
+      "ChangelogMessages": [
+        "Fixed an issue causing 'lambda package' to hang when ran in CI/CD."
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Amazon.Lambda.Tools/LambdaDotNetCLIWrapper.cs b/src/Amazon.Lambda.Tools/LambdaDotNetCLIWrapper.cs
index fd25b56..40f8dc6 100644
--- a/src/Amazon.Lambda.Tools/LambdaDotNetCLIWrapper.cs
+++ b/src/Amazon.Lambda.Tools/LambdaDotNetCLIWrapper.cs
@@ -217,7 +217,7 @@ public int Publish(LambdaToolsDefaults defaults, string projectLocation, string
 
                 proc.EnableRaisingEvents = true;
 
-                proc.WaitForExit();
+                proc.WaitForExit(int.MaxValue);
 
                 exitCode = proc.ExitCode;
             }