diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index a5bdfb6..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM node:16.15.0 as build-stage
-
-RUN apt-get update
-RUN apt-get install -y curl
-
-# RUN curl -sL https://deb.nodesource.com/setup_16.x | bash
-
-RUN apt-get install -y nodejs
-
-COPY package.json /app/
-COPY package-lock.json /app/
-
-WORKDIR /app/
-
-RUN npm install
-
-COPY . /app/
-
-RUN cp -f /app/src/environments/environment.local.ts /app/src/environments/environment.ts
-
-# RUN NODE_OPTIONS="--max-old-space-size=16384"
-
-RUN npm run build -- --prod --base-href=/caddie/ --output-path=./dist/caddie
-
-FROM nginx:1.23.1-alpine
-
-COPY --from=build-stage /app/dist/caddie/ /usr/share/nginx/html/
-
-COPY nginx/default.conf /etc/nginx/conf.d/
-COPY nginx/htpasswd /etc/nginx/htpasswd
-
-EXPOSE 80
diff --git a/Dockerfile.development b/Dockerfile.development
deleted file mode 100644
index 1a5e998..0000000
--- a/Dockerfile.development
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM node:16.17
-
-WORKDIR /app
-
-COPY package*.json ./
-RUN npm install -g n
-RUN n 16.17.1
-RUN npm install
-COPY ./ .
-RUN rm -rf nginx
-
-RUN cp -f /app/src/environments/environment.development.ts /app/src/environments/environment.ts
-
-# RUN NODE_OPTIONS="--max-old-space-size=16384"
-
-RUN npm run build -- --base-href=/caddie/ --output-path=/app/dist/caddie
-
-COPY /app/dist/caddie/ /usr/share/nginx/html/caddie/
-
-COPY nginx/default.conf /etc/nginx/conf.d/
-COPY nginx/htpasswd /etc/nginx/htpasswd
-
-EXPOSE 80
diff --git a/Dockerfile.local b/Dockerfile.local
deleted file mode 100644
index ec30612..0000000
--- a/Dockerfile.local
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM node:16.15.0
-
-RUN apt-get update
-RUN apt-get install -y curl
-
-# RUN curl -sL https://deb.nodesource.com/setup_16.x | bash
-
-RUN apt-get install -y nodejs
-
-COPY package.json /app/
-COPY package-lock.json /app/
-
-WORKDIR /app/
-
-RUN npm install
-
-COPY . /app/
-
-RUN cp -f /app/src/environments/environment.development.ts /app/src/environments/environment.ts
-
-# RUN NODE_OPTIONS="--max-old-space-size=16384"
-
-RUN npm run build -- --prod --base-href=/caddie/ --output-path=./dist/caddie
-
-RUN cp -r /app/dist/caddie/* /usr/share/nginx/html/
-
-COPY nginx/default.conf /etc/nginx/conf.d/
-COPY nginx/htpasswd /etc/nginx/htpasswd
-
-EXPOSE 4200
diff --git a/Dockerfile.production b/Dockerfile.production
deleted file mode 100644
index 2fd1bea..0000000
--- a/Dockerfile.production
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM node:16.15.0 as build-stage
-
-RUN apt-get update
-RUN apt-get install -y curl
-
-# RUN curl -sL https://deb.nodesource.com/setup_16.x | bash
-
-RUN apt-get install -y nodejs
-
-COPY package.json /app/
-COPY package-lock.json /app/
-
-WORKDIR /app/
-
-RUN npm install
-
-COPY . /app/
-
-# RUN NODE_OPTIONS="--max-old-space-size=16384"
-
-RUN cp -f /app/src/environments/environment.production.ts /app/src/environments/environment.ts
-
-RUN npm run build -- --prod --base-href=/caddie/ --output-path=/app/dist/caddie
-
-FROM nginx:1.23.1-alpine
-
-COPY --from=build-stage /app/dist/caddie/ /usr/share/nginx/html/
-
-COPY nginx/default.conf /etc/nginx/conf.d/
-COPY nginx/htpasswd /etc/nginx/htpasswd
-
-EXPOSE 80
diff --git a/docker/Dockerfile.development b/docker/Dockerfile.development
new file mode 100644
index 0000000..170318a
--- /dev/null
+++ b/docker/Dockerfile.development
@@ -0,0 +1,24 @@
+FROM node:16.17 as build-stage
+
+WORKDIR /app
+
+COPY package*.json ./
+RUN npm install -g n
+RUN n 16.17.1
+RUN npm install
+COPY ./ .
+RUN rm -rf nginx
+
+COPY ./src/environments/environment.development.ts ./src/environments/environment.ts
+
+RUN npm run build -- --base-href=/caddie_dev/ --output-path=./dist/caddie-frontend
+
+FROM nginx:mainline-alpine
+
+RUN apk update && apk add --upgrade apk-tools && apk upgrade --available
+
+COPY --from=build-stage /app/dist/caddie-frontend/ /usr/share/nginx/html/caddie/
+
+COPY nginx/default.conf /etc/nginx/conf.d/
+
+EXPOSE 80
\ No newline at end of file
diff --git a/docker/Dockerfile.local b/docker/Dockerfile.local
new file mode 100644
index 0000000..31275b3
--- /dev/null
+++ b/docker/Dockerfile.local
@@ -0,0 +1,24 @@
+FROM node:16.17 as build-stage
+
+WORKDIR /app
+
+COPY package*.json ./
+RUN npm install -g n
+RUN n 16.17.1
+RUN npm install
+COPY ./ .
+RUN rm -rf nginx
+
+COPY ./src/environments/environment.local.ts ./src/environments/environment.ts
+
+RUN npm run build -- --base-href=/caddie/ --output-path=./dist/caddie-frontend
+
+FROM nginx:mainline-alpine
+
+RUN apk update && apk add --upgrade apk-tools && apk upgrade --available
+
+COPY --from=build-stage /app/dist/caddie-frontend/ /usr/share/nginx/html/caddie/
+
+COPY nginx/default.conf /etc/nginx/conf.d/
+
+EXPOSE 80
\ No newline at end of file
diff --git a/docker/Dockerfile.production b/docker/Dockerfile.production
new file mode 100644
index 0000000..e74a2af
--- /dev/null
+++ b/docker/Dockerfile.production
@@ -0,0 +1,24 @@
+FROM node:16.17 as build-stage
+
+WORKDIR /app
+
+COPY package*.json ./
+RUN npm install -g n
+RUN n 16.17.1
+RUN npm install
+COPY ./ .
+RUN rm -rf nginx
+
+COPY ./src/environments/environment.production.ts ./src/environments/environment.ts
+
+RUN npm run build -- --base-href=/caddie/ --output-path=./dist/caddie-frontend
+
+FROM nginx:mainline-alpine
+
+RUN apk update && apk add --upgrade apk-tools && apk upgrade --available
+
+COPY --from=build-stage /app/dist/caddie-frontend/ /usr/share/nginx/html/caddie/
+
+COPY nginx/default.conf /etc/nginx/conf.d/
+
+EXPOSE 80
\ No newline at end of file