diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f50eac7..8f9076e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   deploy-test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.ref == 'refs/heads/main'
     concurrency: deploy-test
     env:
@@ -17,6 +17,7 @@ jobs:
       SERVER_PORT_PUSH_NOTIFICATIONS: 1006
       DOCKER_TAG: ${{ github.sha }}-test
       DOCKER_IMAGE: ghcr.io/${{ github.repository }}/sfscon-backend-test
+      DOCKER_IMAGE_WEBSERVER: ghcr.io/${{ github.repository }}/sfscon-backend-webserver-test
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
@@ -30,6 +31,7 @@ jobs:
           X_SERVER_PORT_PUSH_NOTIFICATIONS: ${{ env.SERVER_PORT_PUSH_NOTIFICATIONS }}
 
           X_DOCKER_IMAGE: ${{ env.DOCKER_IMAGE}}
+          X_DOCKER_IMAGE_WEBSERVER: ${{ env.DOCKER_IMAGE_WEBSERVER }}
           X_DOCKER_TAG: ${{ env.DOCKER_TAG }}
           X_COMPOSE_PROJECT_NAME: ${{ env.PROJECT_NAME }}
 
@@ -49,11 +51,18 @@ jobs:
           
           X_LANE_USERNAME_PREFIX: ${{ secrets.ADMIN_USERNAME }}
 
-
           X_XML_URL: "https://www.sfscon.it/?calendar=2023&format=xml"
           X_REDIS_SERVER: redis
 
-
+      - name: Create .aws.credentials file and inject values
+        env:
+          AWS_KEY_ID_TEST: ${{ secrets.AWS_KEY_ID_TEST }}
+          AWS_ACCESS_KEY_TEST: ${{ secrets.AWS_ACCESS_KEY_TEST }}
+        run: |
+          cp aws.credentials.example .aws.credentials
+          sed -i "s/KEY_ID/$AWS_KEY_ID_TEST/" .aws.credentials
+          sed -i "s/ACCESS_KEY/$AWS_ACCESS_KEY_TEST/" .aws.credentials
+ 
       - name: Build and push images
         uses: noi-techpark/github-actions/docker-build-and-push@v2
         with:
diff --git a/aws.credentials.example b/aws.credentials.example
index 6af0612..d616391 100644
--- a/aws.credentials.example
+++ b/aws.credentials.example
@@ -1,4 +1,4 @@
 [default]
-aws_access_key_id=__KEY_ID__
-aws_secret_access_key=__ACCESS_KEY__
-region=eu-central-1
+aws_access_key_id=KEY_ID
+aws_secret_access_key=ACCESS_KEY
+region=eu-west-1
diff --git a/infrastructure/ansible/deploy.yml b/infrastructure/ansible/deploy.yml
index c01d4fe..86fc3ed 100644
--- a/infrastructure/ansible/deploy.yml
+++ b/infrastructure/ansible/deploy.yml
@@ -17,3 +17,5 @@
             remote: docker-compose.yml
           - local: ../../.env
             remote: .env
+          - local: ../../.aws.credentials
+            remote: .aws.credentials
diff --git a/infrastructure/docker-compose.build.yml b/infrastructure/docker-compose.build.yml
index 5421236..3427e59 100644
--- a/infrastructure/docker-compose.build.yml
+++ b/infrastructure/docker-compose.build.yml
@@ -1,7 +1,11 @@
 services:
-  
   app:
     image: ${DOCKER_IMAGE}:${DOCKER_TAG}
     build:
       context: ../
       dockerfile: infrastructure/docker/Dockerfile
+  webserver:
+    image: ${DOCKER_IMAGE_WEBSERVER}:${DOCKER_TAG}
+    build:
+      context: ../
+      dockerfile: infrastructure/docker/Dockerfile.webserver
diff --git a/infrastructure/docker-compose.run.yml b/infrastructure/docker-compose.run.yml
index 8a43af8..3730f1d 100644
--- a/infrastructure/docker-compose.run.yml
+++ b/infrastructure/docker-compose.run.yml
@@ -1,4 +1,14 @@
 services:
+  
+  webserver:
+    image: ${DOCKER_IMAGE_WEBSERVER}:${DOCKER_TAG}
+    depends_on:
+      conferences:
+        condition: service_started
+      push_notifications:
+        condition: service_started
+    ports:
+      - 8001:80
 
   conferences:
     image: ${DOCKER_IMAGE}:${DOCKER_TAG}
@@ -9,7 +19,7 @@ services:
       - "${SERVER_PORT_CONFERENCES}:8000"
     volumes:
       - opencon-logs:/var/log/opencon
-    healthcheck:
+      - .aws.credentials:/root/.aws/credentials
       test: curl --fail http://localhost:8000/openapi.json || exit 1
       interval: 30s
       retries: 3
diff --git a/infrastructure/docker/Dockerfile b/infrastructure/docker/Dockerfile
index 40eede7..1adf920 100644
--- a/infrastructure/docker/Dockerfile
+++ b/infrastructure/docker/Dockerfile
@@ -22,6 +22,6 @@ RUN chmod +x /start.sh
 
 COPY ./src/scripts /scripts
 
-COPY ./aws.credentials /root/.aws/credentials
+# COPY ./aws.credentials /root/.aws/credentials
 
-CMD ["./start.sh"]
\ No newline at end of file
+CMD ["./start.sh"]
diff --git a/infrastructure/docker/Dockerfile.webserver b/infrastructure/docker/Dockerfile.webserver
index d7f1b5a..c3a18bb 100644
--- a/infrastructure/docker/Dockerfile.webserver
+++ b/infrastructure/docker/Dockerfile.webserver
@@ -2,18 +2,7 @@ FROM node:latest AS build
 
 WORKDIR /app
 
-
-# TODO: REMOVE THIS
-
-RUN git clone https://github.com/digital-cube/sfscon2024-admin.git
-
-
-
-# TODO: UNCOMMENT THIS
-# RUN git clone https://github.com/noi-techpark/it.sfscon.app.webadmin.git sfscon2024-admin
-
-
-
+RUN git clone https://github.com/noi-techpark/it.sfscon.app.webadmin.git sfscon2024-admin
 
 WORKDIR /app/sfscon2024-admin