diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 0c5b730..cce1f6b 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,9 +5,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Fix wrong date">
+      <change afterPath="$PROJECT_DIR$/../frontend/nginx.conf" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../frontend/proxy.conf.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/AdvancedTaskSchedule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/AdvancedTaskSchedule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../docker-compose.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/Dockerfile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/angular.json" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/angular.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/nginx/nginx.conf.template" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/nginx/run_nginx.sh" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../openapi.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../openapi.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -26,7 +34,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$/.." value="test-failing" />
+        <entry key="$PROJECT_DIR$/.." value="master" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
@@ -34,6 +42,9 @@
   <component name="JpbToolWindowState">
     <option name="isToolWindowVisible" value="false" />
   </component>
+  <component name="MavenRunner">
+    <option name="skipTests" value="true" />
+  </component>
   <component name="ProjectColorInfo">{
   &quot;customColor&quot;: &quot;&quot;,
   &quot;associatedIndex&quot;: 6
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 0166c5b..d42b602 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -31,7 +31,7 @@ spring.jpa.open-in-view=false
 spring.data.rest.base-path=/api
 
 # Spring Server setup
-server.address=127.0.0.1
+server.address=0.0.0.0
 server.port=8080
 server.compression.enabled=true
 server.http2.enabled=true
@@ -41,4 +41,5 @@ spring.servlet.multipart.max-request-size=4196KB
 
 demo.webapp.jwtSecret=demoWebappSecretKey
 demo.webapp.jwtExpirationMS=86400000
-spring.jackson.time-zone=UTC
\ No newline at end of file
+spring.jackson.time-zone=UTC
+server.servlet.session.cookie.samesite=None
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 613c1d7..e99d135 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   db:
     image: mariadb:latest
-    container_name: template_mysql
+    container_name: timemanager-db
     environment:
       MYSQL_ROOT_PASSWORD: edkvcjReDxJ9Z8hq
   backend:
@@ -14,12 +14,15 @@ services:
     links:
       - "db:app_db"
     environment:
+      SERVER_ADDRESS: 0.0.0.0
       SPRING_DATASOURCE_USERNAME: root
       SPRING_DATASOURCE_PASSWORD: edkvcjReDxJ9Z8hq
       SPRING_DATASOURCE_URL: jdbc:mariadb://app_db:3306/restservice?createDatabaseIfNotExist=true&autoReconnect=true
     depends_on:
       - "db"
     restart: always
+    ports:
+      - "8080:8080"
   frontend:
     build:
       context: ./frontend
@@ -27,6 +30,8 @@ services:
     restart: always
     links:
       - backend:backend
+    depends_on:
+      - "backend"
     ports:
       - "4200:80"
     environment:
@@ -38,4 +43,4 @@ services:
     #}
     # bind-mount it read-only via:
     #volumes:
-    #  - ./api.json:/usr/share/nginx/html/assets/api.json:ro
+    #  - ./api.json:/usr/share/nginx/html/assets/api.json:ro
\ No newline at end of file
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 2e2bf99..74b2d77 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,29 +1,18 @@
-FROM node:16-alpine as builder
-
+### STAGE 1: Build ###
+FROM node:18.17.1 AS build
+WORKDIR /app
 COPY package*.json ./
-
-RUN npm set progress=false && npm config set depth 0 && npm cache clean --force
-
-RUN npm i && mkdir /ng-app && cp -R ./node_modules ./ng-app
-
-WORKDIR /ng-app
-
+RUN npm install
 COPY . .
+RUN npm run build --prod
 
-RUN $(npm bin)/ng build --configuration=production --build-optimizer
-
-
-FROM nginx:stable-alpine
+### STAGE 2: Deploy ###
+FROM nginx:latest
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get install iputils-ping -y
+COPY --from=build /app/dist/frontend /usr/share/nginx/html
+COPY nginx.conf /etc/nginx/nginx.conf
 
 EXPOSE 80
-
-COPY nginx/nginx.conf.template /
-
-RUN rm -rf /usr/share/nginx/html/*
-
-COPY --from=builder /ng-app/dist/frontend/ /usr/share/nginx/html
-RUN chown -R nginx:nginx /usr/share/nginx/html/
-
-COPY nginx/run_nginx.sh /
-
-CMD ["sh", "/run_nginx.sh"]
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/frontend/angular.json b/frontend/angular.json
index 691c23f..6e7641a 100644
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -38,8 +38,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "500kb",
-                  "maximumError": "1mb"
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
                 },
                 {
                   "type": "anyComponentStyle",
diff --git a/frontend/nginx/nginx.conf.template b/frontend/nginx.conf
similarity index 63%
rename from frontend/nginx/nginx.conf.template
rename to frontend/nginx.conf
index fd83bf4..79fabd8 100644
--- a/frontend/nginx/nginx.conf.template
+++ b/frontend/nginx.conf
@@ -1,7 +1,6 @@
 user  nginx;
 worker_processes  1;
 
-error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
 
 
@@ -14,12 +13,6 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    log_format  main  '${DOLLAR}remote_addr - ${DOLLAR}remote_user [${DOLLAR}time_local] "${DOLLAR}request" '
-                      '${DOLLAR}status ${DOLLAR}body_bytes_sent "${DOLLAR}http_referer" '
-                      '"${DOLLAR}http_user_agent" "${DOLLAR}http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
     sendfile        on;
     #tcp_nopush     on;
 
@@ -40,12 +33,17 @@ http {
          add_header "Access-Control-Allow-Methods" 'GET, POST, OPTIONS, PUT, DELETE';
          add_header "Access-Control-Allow-Headers" 'X-Requested-With,Accept,Content-Type, Origin';
 
-        location / {
-                try_files ${DOLLAR}uri ${DOLLAR}uri/ /index.html;
+        location /api {
+           proxy_pass http://backend/;
+           add_header "Access-Control-Allow-Origin" "*";
+           add_header "Access-Control-Allow-Methods" 'GET, POST, OPTIONS, PUT, DELETE';
+           add_header "Access-Control-Allow-Headers" 'X-Requested-With,Accept,Content-Type, Origin';
         }
 
-        location /api {
-          proxy_pass ${BACKEND_URL};
+        location / {
+                try_files $uri $uri/ /index.html =404;
         }
+
+
     }
 }
diff --git a/frontend/nginx/run_nginx.sh b/frontend/nginx/run_nginx.sh
deleted file mode 100644
index 4b6acab..0000000
--- a/frontend/nginx/run_nginx.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-# generate nginx-configuration (insert env variables)
-
-export DOLLAR='$'
-envsubst < ./nginx.conf.template > /etc/nginx/nginx.conf
-
-# start nginx
-exec nginx -g "daemon off;"
diff --git a/frontend/proxy.conf.json b/frontend/proxy.conf.json
new file mode 100644
index 0000000..8de5f19
--- /dev/null
+++ b/frontend/proxy.conf.json
@@ -0,0 +1,6 @@
+{
+  "/api": {
+    "target": "http://backend",
+    "secure": false
+  }
+}
diff --git a/frontend/src/api/api/account.service.ts b/frontend/src/api/api/account.service.ts
index c0535ec..25f9a01 100644
--- a/frontend/src/api/api/account.service.ts
+++ b/frontend/src/api/api/account.service.ts
@@ -35,7 +35,7 @@ import { Configuration }                                     from '../configurat
 })
 export class AccountService {
 
-    protected basePath = 'http://localhost:8080/api';
+    protected basePath = 'http://127.0.0.1:8080/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
     public encoder: HttpParameterCodec;
diff --git a/frontend/src/api/api/history.service.ts b/frontend/src/api/api/history.service.ts
index 21b3869..46e7755 100644
--- a/frontend/src/api/api/history.service.ts
+++ b/frontend/src/api/api/history.service.ts
@@ -31,7 +31,7 @@ import { Configuration }                                     from '../configurat
 })
 export class HistoryService {
 
-    protected basePath = 'http://localhost:8080/api';
+    protected basePath = 'http://127.0.0.1:8080/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
     public encoder: HttpParameterCodec;
diff --git a/frontend/src/api/api/login.service.ts b/frontend/src/api/api/login.service.ts
index cc87712..cf9b197 100644
--- a/frontend/src/api/api/login.service.ts
+++ b/frontend/src/api/api/login.service.ts
@@ -36,7 +36,7 @@ import { Configuration }                                     from '../configurat
 })
 export class LoginService {
 
-    protected basePath = 'http://localhost:8080/api';
+    protected basePath = 'http://127.0.0.1:8080/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
     public encoder: HttpParameterCodec;
diff --git a/frontend/src/api/api/properties.service.ts b/frontend/src/api/api/properties.service.ts
index cfe6724..1958122 100644
--- a/frontend/src/api/api/properties.service.ts
+++ b/frontend/src/api/api/properties.service.ts
@@ -34,7 +34,7 @@ import { Configuration }                                     from '../configurat
 })
 export class PropertiesService {
 
-    protected basePath = 'http://localhost:8080/api';
+    protected basePath = 'http://127.0.0.1:8080/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
     public encoder: HttpParameterCodec;
diff --git a/frontend/src/api/api/schedule.service.ts b/frontend/src/api/api/schedule.service.ts
index de9eb2c..14e529e 100644
--- a/frontend/src/api/api/schedule.service.ts
+++ b/frontend/src/api/api/schedule.service.ts
@@ -36,7 +36,7 @@ import { Configuration }                                     from '../configurat
 })
 export class ScheduleService {
 
-    protected basePath = 'http://localhost:8080/api';
+    protected basePath = 'http://127.0.0.1:8080/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
     public encoder: HttpParameterCodec;
diff --git a/frontend/src/api/api/task.service.ts b/frontend/src/api/api/task.service.ts
index 862453e..d34276b 100644
--- a/frontend/src/api/api/task.service.ts
+++ b/frontend/src/api/api/task.service.ts
@@ -35,7 +35,7 @@ import { Configuration }                                     from '../configurat
 })
 export class TaskService {
 
-    protected basePath = 'http://localhost:8080/api';
+    protected basePath = 'http://127.0.0.1:8080/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
     public encoder: HttpParameterCodec;
diff --git a/frontend/src/api/api/taskgroup.service.ts b/frontend/src/api/api/taskgroup.service.ts
index 5b797b2..8433f82 100644
--- a/frontend/src/api/api/taskgroup.service.ts
+++ b/frontend/src/api/api/taskgroup.service.ts
@@ -36,7 +36,7 @@ import { Configuration }                                     from '../configurat
 })
 export class TaskgroupService {
 
-    protected basePath = 'http://localhost:8080/api';
+    protected basePath = 'http://127.0.0.1:8080/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
     public encoder: HttpParameterCodec;
diff --git a/frontend/src/api/api/users.service.ts b/frontend/src/api/api/users.service.ts
index 4a3bdd4..86527fc 100644
--- a/frontend/src/api/api/users.service.ts
+++ b/frontend/src/api/api/users.service.ts
@@ -34,7 +34,7 @@ import { Configuration }                                     from '../configurat
 })
 export class UsersService {
 
-    protected basePath = 'http://localhost:8080/api';
+    protected basePath = 'http://127.0.0.1:8080/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
     public encoder: HttpParameterCodec;
diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts
index 3612073..796e0cd 100644
--- a/frontend/src/environments/environment.prod.ts
+++ b/frontend/src/environments/environment.prod.ts
@@ -1,3 +1,4 @@
 export const environment = {
-  production: true
+  production: true,
+  api: "/api"
 };
diff --git a/openapi.yaml b/openapi.yaml
index 1a2067f..a1a74d3 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -3,7 +3,7 @@ info:
   title: API Title
   version: '1.0'
 servers:
-  - url: http://localhost:8080/api
+  - url: http://127.0.0.1:8080/api
 paths:
   /auth/signin:
     post: