diff --git a/src/DMAPI/tgs.dm b/src/DMAPI/tgs.dm
index ce5ce4885a..5dfb6230ee 100644
--- a/src/DMAPI/tgs.dm
+++ b/src/DMAPI/tgs.dm
@@ -68,9 +68,9 @@
 #define TGS_EVENT_COMPILE_START 8
 #define TGS_EVENT_COMPILE_CANCELLED 9
 #define TGS_EVENT_COMPILE_FAILURE 10
-#define TGS_EVENT_COMPILE_COMPLETE 11
+#define TGS_EVENT_COMPILE_COMPLETE 11 // Note, this event fires before the new .dmb is loaded into the watchdog. Consider using the TGS_EVENT_DEPLOYMENT_COMPLETE instead
 #define TGS_EVENT_INSTANCE_AUTO_UPDATE_START 12
-#define TGS_EVENT_REPO_MERGE_CONFLICT 13
+#define TGS_EVENT_DEPLOYMENT_COMPLETE 13
 
 //OTHER ENUMS
 
diff --git a/src/Tgstation.Server.Host/Components/EventType.cs b/src/Tgstation.Server.Host/Components/EventType.cs
index f711742dbe..e501403ebf 100644
--- a/src/Tgstation.Server.Host/Components/EventType.cs
+++ b/src/Tgstation.Server.Host/Components/EventType.cs
@@ -8,71 +8,76 @@
 		/// <summary>
 		/// Parameters: Reference name, commit sha
 		/// </summary>
-		RepoResetOrigin = 0,
+		RepoResetOrigin,
 
 		/// <summary>
 		/// Parameters: Checkout target
 		/// </summary>
-		RepoCheckout = 1,
+		RepoCheckout,
 
 		/// <summary>
 		/// No parameters
 		/// </summary>
-		RepoFetch = 2,
+		RepoFetch,
 
 		/// <summary>
 		/// Parameters: Pull request number, pull request sha, merger message
 		/// </summary>
-		RepoMergePullRequest = 3,
+		RepoMergePullRequest,
 
 		/// <summary>
 		/// Parameters: Absolute path to repository root
 		/// </summary>
-		RepoPreSynchronize = 4,
+		RepoPreSynchronize,
 
 		/// <summary>
 		/// Parameters: Version being installed
 		/// </summary>
-		ByondInstallStart = 5,
+		ByondInstallStart,
 
 		/// <summary>
 		/// Parameters: Error string
 		/// </summary>
-		ByondInstallFail = 6,
+		ByondInstallFail,
 
 		/// <summary>
 		/// Parameters: Old active version, new active version
 		/// </summary>
-		ByondActiveVersionChange = 7,
+		ByondActiveVersionChange,
 
 		/// <summary>
 		/// Parameters: Game directory path, origin commit sha
 		/// </summary>
-		CompileStart = 8,
+		CompileStart,
 
 		/// <summary>
 		/// No parameters
 		/// </summary>
-		CompileCancelled = 9,
+		CompileCancelled,
 
 		/// <summary>
 		/// Parameters: Game directory path, "1" if compile succeeded and api validation failed, "0" otherwise
 		/// </summary>
-		CompileFailure = 10,
+		CompileFailure,
 
 		/// <summary>
 		/// Parameters: Game directory path
 		/// </summary>
-		CompileComplete = 11,
+		CompileComplete,
 
 		/// <summary>
 		/// No parameters
 		/// </summary>
-		InstanceAutoUpdateStart = 12,
+		InstanceAutoUpdateStart,
 
 		/// <summary>
 		/// Parameters: Base sha, target sha, base reference, target reference
 		/// </summary>
-		RepoMergeConflict = 13,
+		RepoMergeConflict,
+
+		/// <summary>
+		/// No parameters
+		/// </summary>
+		DeploymentComplete
 	}
 }
diff --git a/src/Tgstation.Server.Host/Components/Instance.cs b/src/Tgstation.Server.Host/Components/Instance.cs
index 34d582a381..687eb2c246 100644
--- a/src/Tgstation.Server.Host/Components/Instance.cs
+++ b/src/Tgstation.Server.Host/Components/Instance.cs
@@ -256,7 +256,11 @@ namespace Tgstation.Server.Host.Components
 
 			databaseContext.CompileJobs.Add(compileJob); // will be saved by job context
 
-			job.PostComplete = ct => compileJobConsumer.LoadCompileJob(compileJob, ct);
+			job.PostComplete = async postCompleteCancellationToken =>
+			{
+				await compileJobConsumer.LoadCompileJob(compileJob, postCompleteCancellationToken).ConfigureAwait(false);
+				await eventConsumer.HandleEvent(EventType.DeploymentComplete, null, postCompleteCancellationToken).ConfigureAwait(false);
+			};
 
 			if (repositorySettings?.AccessToken != null)
 			{