diff --git a/public/logo/word_mark_black.png b/public/logo/word_mark_black.png
index ba6fb84e..cc412165 100644
Binary files a/public/logo/word_mark_black.png and b/public/logo/word_mark_black.png differ
diff --git a/public/logo/word_mark_white.png b/public/logo/word_mark_white.png
index fb7a252d..cd02b58a 100644
Binary files a/public/logo/word_mark_white.png and b/public/logo/word_mark_white.png differ
diff --git a/server/private/license/license.ts b/server/private/license/license.ts
index d1138539..56b744a0 100644
--- a/server/private/license/license.ts
+++ b/server/private/license/license.ts
@@ -59,7 +59,8 @@ type TokenPayload = {
 };
 
 export class License {
-    private phoneHomeInterval = 6 * 60 * 60; // 6 hours = 6 * 60 * 60 = 21600 seconds
+    // private phoneHomeInterval = 6 * 60 * 60; // 6 hours = 6 * 60 * 60 = 21600 seconds
+    private phoneHomeInterval = 30; // 30 seconds for testing
     private serverBaseUrl = "https://api.fossorial.io";
     private validationServerUrl = `${this.serverBaseUrl}/api/v1/license/enterprise/validate`;
     private activationServerUrl = `${this.serverBaseUrl}/api/v1/license/enterprise/activate`;
@@ -255,6 +256,7 @@ LQIDAQAB
                     cached.type = payload.type;
                     cached.tier = payload.tier;
                     cached.iat = new Date(payload.iat * 1000);
+                    cached.terminateAt = new Date(payload.terminateAt);
 
                     // Encrypt the updated token before storing
                     const encryptedKey = encrypt(
diff --git a/src/components/CreateDomainForm.tsx b/src/components/CreateDomainForm.tsx
index 38a4549c..258aee49 100644
--- a/src/components/CreateDomainForm.tsx
+++ b/src/components/CreateDomainForm.tsx
@@ -125,7 +125,7 @@ export default function CreateDomainForm({
         resolver: zodResolver(formSchema),
         defaultValues: {
             baseDomain: "",
-            type: build == "oss" ? "wildcard" : "ns"
+            type: build == "oss" || !env.flags.usePangolinDns ? "wildcard" : "ns"
         }
     });
 
diff --git a/src/components/LicenseKeysDataTable.tsx b/src/components/LicenseKeysDataTable.tsx
index 71b15681..9c4750b4 100644
--- a/src/components/LicenseKeysDataTable.tsx
+++ b/src/components/LicenseKeysDataTable.tsx
@@ -80,7 +80,7 @@ export function LicenseKeysDataTable({
             }
         },
         {
-            accessorKey: "type",
+            accessorKey: "tier",
             header: ({ column }) => {
                 return (
                     <Button