diff --git a/components/Newsletter/SubscribeForm.tsx b/components/Newsletter/SubscribeForm.tsx
index 140970215..92a6ccfae 100644
--- a/components/Newsletter/SubscribeForm.tsx
+++ b/components/Newsletter/SubscribeForm.tsx
@@ -3,6 +3,8 @@ import toast, { Toaster } from 'react-hot-toast'
 import validator from 'validator'
 import style from './newsletterform.module.css'
 
+const isDevelopment = true //TODO
+
 const SubscribeForm = () => {
   const [email, setEmail] = useState('')
   const [isLoading, setIsLoading] = useState(false)
@@ -49,12 +51,17 @@ const SubscribeForm = () => {
         <form onSubmit={handleSubmit} className={style[`form-container`]}>
           <input
             type="email"
-            placeholder="Enter your email"
+            placeholder={isDevelopment ? 'Coming soon...' : 'Enter your email'}
             value={email}
             onChange={(e) => setEmail(e.target.value)}
             className={style[`email-input`]}
+            readOnly={isDevelopment}
           />
-          <button type="submit" className={style[`subscribe-button`]} disabled={isLoading}>
+          <button
+            type="submit"
+            className={style[`subscribe-button`]}
+            disabled={isLoading || isDevelopment}
+          >
             {isLoading ? 'Subscribing...' : 'Subscribe'}
           </button>
         </form>
diff --git a/components/Newsletter/UnsubscribeForm.tsx b/components/Newsletter/UnsubscribeForm.tsx
index d8539f739..a1d81bbfa 100644
--- a/components/Newsletter/UnsubscribeForm.tsx
+++ b/components/Newsletter/UnsubscribeForm.tsx
@@ -3,6 +3,8 @@ import toast, { Toaster } from 'react-hot-toast'
 import validator from 'validator'
 import style from './newsletterform.module.css'
 
+const isDevelopment = true //TODO
+
 const UnsubscribeForm = () => {
   const [email, setEmail] = useState('')
   const [isLoading, setIsLoading] = useState(false)
@@ -43,18 +45,24 @@ const UnsubscribeForm = () => {
 
   return (
     <div className={style.container}>
+      <br />
       <Toaster position="bottom-center" reverseOrder={false} />
       <div className={style[`form-wrapper`]}>
         <h2 className={style[`form-title`]}>Unsubscribe From Our Newsletter</h2>
         <form onSubmit={handleSubmit} className={style[`form-container`]}>
           <input
             type="email"
-            placeholder="Enter your email"
+            placeholder={isDevelopment ? 'Coming soon...' : 'Enter your email'}
             value={email}
             onChange={(e) => setEmail(e.target.value)}
             className={style[`email-input`]}
+            readOnly={isDevelopment}
           />
-          <button type="submit" className={style[`subscribe-button`]} disabled={isLoading}>
+          <button
+            type="submit"
+            className={style[`subscribe-button`]}
+            disabled={isLoading || isDevelopment}
+          >
             {isLoading ? 'Unsubscribing...' : 'Unsubscribe'}
           </button>
         </form>
diff --git a/next-sitemap.config.js b/next-sitemap.config.js
index 4dda5bfe0..37b4d6bd9 100644
--- a/next-sitemap.config.js
+++ b/next-sitemap.config.js
@@ -2,7 +2,7 @@
 
 /** @type {import('next-sitemap').IConfig} */
 module.exports = {
-  siteUrl: 'https://www.librechat.cfd',
+  siteUrl: 'https://www.librechat.ai',
   generateRobotsTxt: true,
   changefreq: 'daily',
   exclude: ['*/_meta'],
diff --git a/package.json b/package.json
index 14b8971fe..834fe4f56 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "prettier": "pnpm lint:prettier --write",
     "prepare": "husky"
   },
-  "homepage": "https://www.librechat.cfd",
+  "homepage": "https://www.librechat.ai",
   "dependencies": {
     "@calcom/embed-react": "^1.5.0",
     "@glidejs/glide": "^3.6.0",
diff --git a/pages/404.mdx b/pages/404.mdx
index 36f6e8c48..1a301322f 100644
--- a/pages/404.mdx
+++ b/pages/404.mdx
@@ -4,6 +4,6 @@
 
 # 🤷
 
-[Submit an issue about broken links ↗](https://github.com/noreplylibrechatai/librechat.ai/issues/new?title=Found%20broken%20%60%2Fdocs%60%20link.%20Please%20fix!&labels=bug)
+[Submit an issue about broken links ↗](https://github.com/LibreChat-AI/librechat.ai/issues/new?title=Found%20broken%20%60%2Fdocs%60%20link.%20Please%20fix!&labels=bug)
 
 </div>
diff --git a/theme.config.tsx b/theme.config.tsx
index a7faabce4..34a6d19d1 100644
--- a/theme.config.tsx
+++ b/theme.config.tsx
@@ -39,7 +39,7 @@ const config: DocsThemeConfig = {
   toc: {
     backToTop: true,
   },
-  docsRepositoryBase: 'https://github.com/noreplylibrechatai/librechat.ai/tree/main',
+  docsRepositoryBase: 'https://github.com/LibreChat-AI/librechat.ai/tree/main',
   footer: {
     content: <FooterMenu />,
   },
@@ -63,12 +63,10 @@ const config: DocsThemeConfig = {
           : '/images/socialcards/default-image.png'
 
     const image = frontMatter.ogImage
-      ? 'https://nextra.librechat.cfd' + frontMatter.ogImage // Use frontmatter image if available
+      ? 'https://www.librechat.ai' + frontMatter.ogImage // Use frontmatter image if available
       : defaultImage // Use default image based on path if frontmatter image is not available
 
-    const video = frontMatter.ogVideo
-      ? 'https://nextra.librechat.cfd' + frontMatter.ogVideo //TODO Update URL
-      : null
+    const video = frontMatter.ogVideo ? 'https://www.librechat.ai' + frontMatter.ogVideo : null
 
     return (
       <>
@@ -83,8 +81,8 @@ const config: DocsThemeConfig = {
         <meta property="og:image" content={image} />
         <meta property="twitter:image" content={image} />
         <meta name="twitter:card" content="summary_large_image" />
-        <meta name="twitter:site:domain" content="librechat.ai" /> //TODO Update URL
-        <meta name="twitter:url" content="https://librechat.ai" /> //TODO Update URL
+        <meta name="twitter:site:domain" content="librechat.ai" />
+        <meta name="twitter:url" content="https://librechat.ai" />
         <style
           dangerouslySetInnerHTML={{
             __html: `html { --font-geist-sans: ${GeistSans.style.fontFamily}; }`,