diff --git a/Dockerfile.backend b/Dockerfile
similarity index 90%
rename from Dockerfile.backend
rename to Dockerfile
index 8e43db10addaa6046edddb0c3c8457b86f012cea..aca4911e552556a01c0fc82a2beacfb0abe1aadd 100644
--- a/Dockerfile.backend
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # need node/npm to run "npm run build" for our vue frontend
-FROM node:20-alpine as build-frontend
+FROM node:20-alpine AS build-frontend
 
 # working directory for our frontend
 WORKDIR /app
@@ -22,7 +22,7 @@ FROM eclipse-temurin:17-jre-alpine as build-backend
 WORKDIR /app
 
 # copying frontend to static folder so spring can serve it
-COPY --from build-frontend /app/dist /app/src/main/resources/static
+COPY --from=build-frontend /app/dist /app/src/main/resources/static
 
 # copying backend to root folder in container
 COPY . .
diff --git a/src/main/java/com/cloudcomputing/todo/controller/FallbackController.java b/src/main/java/com/cloudcomputing/todo/controller/FallbackController.java
new file mode 100644
index 0000000000000000000000000000000000000000..cd60186f25fdda0d8877d5a2a6e0d309183944a5
--- /dev/null
+++ b/src/main/java/com/cloudcomputing/todo/controller/FallbackController.java
@@ -0,0 +1,14 @@
+package com.cloudcomputing.todo.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+public class FallbackController {
+
+    @RequestMapping(value = "/**/{path:[^\\.]*}")
+    public String redirect(){
+        return "forward:/index.html";
+    }
+}