diff --git a/src/CommunityToolkit.Aspire.Hosting.SurrealDb/SurrealDbBuilderExtensions.cs b/src/CommunityToolkit.Aspire.Hosting.SurrealDb/SurrealDbBuilderExtensions.cs
index 6472c3131..d6adb118e 100644
--- a/src/CommunityToolkit.Aspire.Hosting.SurrealDb/SurrealDbBuilderExtensions.cs
+++ b/src/CommunityToolkit.Aspire.Hosting.SurrealDb/SurrealDbBuilderExtensions.cs
@@ -533,6 +533,9 @@ CancellationToken cancellationToken
 
         foreach (var surrealInstance in surrealDbServerInstances)
         {
+            var username = await surrealInstance.UserNameReference.GetValueAsync(cancellationToken);
+            var password = await surrealInstance.PasswordParameter.GetValueAsync(cancellationToken);
+                
             if (surrealInstance.PrimaryEndpoint.IsAllocated)
             {
                 SurrealDbNamespaceResource? uniqueNamespace = null;
@@ -577,6 +580,8 @@ CancellationToken cancellationToken
                 // How to do host resolution?
                 writer.WriteString("hostname", $"{endpoint.Host}:{endpoint.Port}");
                 writer.WriteString("mode", "root");
+                writer.WriteString("username", username);
+                writer.WriteString("password", password);
                 if (uniqueNamespace is not null)
                 {
                     writer.WriteString("namespace", uniqueNamespace.NamespaceName);
diff --git a/src/CommunityToolkit.Aspire.Hosting.SurrealDb/SurrealDbContainerImageTags.cs b/src/CommunityToolkit.Aspire.Hosting.SurrealDb/SurrealDbContainerImageTags.cs
index 8a5331c18..b2ec7e980 100644
--- a/src/CommunityToolkit.Aspire.Hosting.SurrealDb/SurrealDbContainerImageTags.cs
+++ b/src/CommunityToolkit.Aspire.Hosting.SurrealDb/SurrealDbContainerImageTags.cs
@@ -9,13 +9,13 @@ internal sealed class SurrealDbContainerImageTags
     public const string Registry = "docker.io";
     /// <summary>surrealdb/surrealdb</summary>
     public const string Image = "surrealdb/surrealdb";
-    /// <summary>v2.3</summary>
-    public const string Tag = "v2.3";
+    /// <summary>v2.4</summary>
+    public const string Tag = "v2.4";
     
     /// <summary>docker.io</summary>
     public const string SurrealistRegistry = "docker.io";
     /// <summary>surrealdb/surrealist</summary>
     public const string SurrealistImage = "surrealdb/surrealist";
-    /// <summary>3.3.2</summary>
-    public const string SurrealistTag = "3.3.2";
+    /// <summary>3.6.9</summary>
+    public const string SurrealistTag = "3.6.9";
 }
\ No newline at end of file