diff --git a/package.json b/package.json
index b452228..1babba7 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,5 @@
 {
+  "homepage": "https://alttd.com/forms",
   "name": "forms",
   "version": "0.1.0",
   "private": true,
@@ -21,7 +22,7 @@
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build": "set \"PUBLIC_URL=/forms\" && react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
diff --git a/src/App.tsx b/src/App.tsx
index b9ba31e..02a85bd 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -12,7 +12,7 @@ function App() {
     return (
         <div className="app-container">
             <Header/>
-            <BrowserRouter>
+            <BrowserRouter basename="/forms">
                 <Routes>
                     <Route path="/" element={<Home/>}/>
                     <Route path="/contact" element={<ContactForm/>}/>
diff --git a/src/components/contact_form/contact.tsx b/src/components/contact_form/contact.tsx
index 96b519a..5856e14 100644
--- a/src/components/contact_form/contact.tsx
+++ b/src/components/contact_form/contact.tsx
@@ -55,7 +55,7 @@ const ContactForm = () => {
 
     const handleSubmit = async (e: FormikValues) => {
         try {
-            const response = await fetch('http://localhost:8080/api/contact/submitContactForm', {
+            const response = await fetch('http://localhost:8002/api/contact/submitContactForm', {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
diff --git a/src/components/verify_email/verify_mail.tsx b/src/components/verify_email/verify_mail.tsx
index 9edeb1e..0134f89 100644
--- a/src/components/verify_email/verify_mail.tsx
+++ b/src/components/verify_email/verify_mail.tsx
@@ -42,7 +42,7 @@ const VerifyMail: FC = () => {
             eMail: email
         }
         console.log(verificationData);
-        fetch('http://localhost:8080/api/verify_email/form', {
+        fetch('http://localhost:8002/api/verify_email/form', {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',