Merge branch 'master' into develop

# Conflicts:
#	.github/workflows/release.yml

.github/workflows/release.yml

@@ -80,7 +80,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: ghcr.io
           workdir: api/monitoring/grafana
-  docker-push-kiwiq:
+  docker-push-reverse-proxy:
     runs-on: ubuntu-latest
     needs: [ unit-tests ]
     steps:
@@ -102,11 +102,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Create .env file
-        run: echo "REACT_APP_API_ENDPOINT=https://${{ secrets.DEPLOY_HOST }}:8443" > webapp/.env
+        run: echo "REACT_APP_API_ENDPOINT=https://${{secrets.APP_DOMAIN}}:8443" > webapp/.env
+
       - name: Publish to Registry
         uses: elgohr/Publish-Docker-Github-Action@v5
         env:
-          REACT_APP_API_ENDPOINT: https://${{ secrets.DEPLOY_HOST }}:8443
+          REACT_APP_API_ENDPOINT: https://${{secrets.APP_DOMAIN}}:8443
           teamname: wiq_en2b
         with:
           name: arquisoft/wiq_en2b/webapp
@@ -138,7 +139,7 @@ jobs:
   deploy:
     name: Deploy over SSH
     runs-on: ubuntu-latest
-    needs: [docker-push-api, docker-push-webapp, docker-push-question-generator, docker-push-kiwiq]
+    needs: [docker-push-api, docker-push-webapp, docker-push-question-generator, docker-push-reverse-proxy, docker-push-prometheus, docker-push-grafana]
     steps:
     - name: Deploy over SSH
       uses: fifsky/ssh-action@master
@@ -157,7 +158,7 @@ jobs:
           echo "DATABASE_USER=${{ secrets.DATABASE_USER }}" >> .env
           echo "DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }}" >> .env
           echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> .env
-          echo "API_URI=https://${{ secrets.DEPLOY_HOST }}:8443" >> .env
+          echo "API_URI=https://${{ secrets.APP_DOMAIN }}:8443" >> .env
           echo "SSL_PASSWORD=${{ secrets.SSL_PASSWORD }}" >> .env
           docker compose --profile prod down
           docker compose --profile prod up -d --pull always