diff --git a/backend/src/index.js b/backend/src/index.js
index a14e5d2..ab506a5 100644
--- a/backend/src/index.js
+++ b/backend/src/index.js
@@ -7,6 +7,7 @@ const path = require('path');
 const dotenv = require('dotenv');
 
 if(process.env.NODE_ENV) {
+  console.log(`.env.${process.env.NODE_ENV}`);
   dotenv.config({
     path: `.env.${process.env.NODE_ENV}`
   });
@@ -20,7 +21,7 @@ const connectDB = require("./db");
 
 // PUBLIC
 const uploadDir = path.join(__dirname, 'uploads');
-app.use('/public', express.static(uploadDir));
+app.use('/api/public', express.static(uploadDir));
 
 // JSON LIMIT EXPRESS
 app.use(express.json({ limit: '50mb' }));
@@ -45,15 +46,15 @@ app.use(cors({
 }));
 
 // ROUTES (NO AUTH)
-app.use('/user', require('./routes/user'));
+app.use('/api/user', require('./routes/user'));
 
 // AUTH
 checkAuth = passport.authenticate('jwt', { session: false });
 app.use(checkAuth);
 
 // ROUTES WITH AUTH
-app.use('/campaign', require('./routes/campaign'));
-app.use('/note', require('./routes/note'));
+app.use('/api/campaign', require('./routes/campaign'));
+app.use('/api/note', require('./routes/note'));
 /*
 app.use('/campaign', require('./routes/campaign'));
 app.use('/maps', require('./routes/map'));
diff --git a/frontend/app/components/partials/EditUserPartial.vue b/frontend/app/components/partials/EditUserPartial.vue
index 6739b46..d8d7da5 100644
--- a/frontend/app/components/partials/EditUserPartial.vue
+++ b/frontend/app/components/partials/EditUserPartial.vue
@@ -21,7 +21,7 @@ function retrieveAvatar(){
     Server().get('/user/retrieve-avatar?username=' + GetUser().username)
     .then((response) => {
         if(response.data.image){
-            const imgUrl = backendUrl + "public/" + response.data.image;
+            const imgUrl = backendUrl + "/public/" + response.data.image;
 
             // Wait for the image to fully load
             const img = new Image();
diff --git a/frontend/app/services/BackendURL.js b/frontend/app/services/BackendURL.js
index 2e84d30..1912c48 100644
--- a/frontend/app/services/BackendURL.js
+++ b/frontend/app/services/BackendURL.js
@@ -1,6 +1,4 @@
-
-const config = useRuntimeConfig()
-const backendUrl = config.public.apiBaseUrl
+const backendUrl = process.env.API_BASE_URL || 'http://localhost:5000/api'
 
 export {
     backendUrl