diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..bd3c212
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+.gitignore
+src/cloudformation.yaml
+LICENSE
+README.md
\ No newline at end of file
diff --git a/.github/workflows/docker_build_and_push.yml b/.github/workflows/docker_build_and_push.yml
new file mode 100644
index 0000000..d8c40d5
--- /dev/null
+++ b/.github/workflows/docker_build_and_push.yml
@@ -0,0 +1,40 @@
+name: docker
+
+on:
+  push:
+    branches:
+      - 'develop'
+      - 'main'
+
+env:
+  DOCKERHUB_TAG: ${{ env.BRANCH == 'main' && 'latest' || 'develop' }}
+
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - 
+        id: container_name
+        uses: ASzc/change-string-case-action@v5
+        with:
+          string: ${{ github.repository_owner }}/${{ github.event.repository.name }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: ${{ steps.container_name.outputs.lowercase }}:${{ env.DOCKERHUB_TAG }}
+
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..9709b20
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,13 @@
+FROM node:20-alpine as build
+
+ARG REACT_APP_SERVICES_HOST=/services/m
+
+COPY . /app
+WORKDIR /app/src
+
+RUN npm install
+RUN npm run build
+
+
+FROM nginx
+COPY --from=build /app/dist /usr/share/nginx/html
\ No newline at end of file
diff --git a/src/package.json b/src/package.json
index 0982b2d..13842ce 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
 	"dependencies": {
-		"bootstrap": "^5.2.3",
+		"bootstrap": "^5.3.2",
 		"lz-string": "^1.5.0",
 		"http-server": "^14.1.1"
 	},