diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1661dae..802729e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -104,15 +104,12 @@ jobs:
     - uses: actions/checkout@v4
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@v5
-      env:
-        WEBAPP_URI: http://${{ secrets.DEPLOY_HOST }}:3000
       with:
         name: arquisoft/wiq_en3a/gatewayservice
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
         registry: ghcr.io
         workdir: gatewayservice
-        buildargs: WEBAPP_URI
 
   deploy:
     name: Deploy over SSH
@@ -121,6 +118,8 @@ jobs:
     steps:
     - name: Deploy over SSH
       uses: fifsky/ssh-action@master
+      env:
+        API_URI: ${{ secrets.DEPLOY_HOST }}
       with:
         host: ${{ secrets.DEPLOY_HOST }}
         user: ${{ secrets.DEPLOY_USER }}
diff --git a/docker-compose.yml b/docker-compose.yml
index 34be453..8f8fb95 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -62,8 +62,6 @@ services:
       context: ./webapp
     environment:
       - REACT_APP_API_ENDPOINT=${API_URI}
-    depends_on:
-      - gatewayservice
     ports:
       - "3000:3000"
 
diff --git a/webapp/package.json b/webapp/package.json
index cb5ddbd..4f6be51 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -33,12 +33,11 @@
     "zustand": "^4.5.2"
   },
   "scripts": {
-    "start": "set HTTP=true && react-scripts start",
-    "build": "set HTTP=true && react-scripts build",
+    "start": "react-scripts start",
+    "build": "react-scripts build",
     "prod": "serve -s build",
     "test": "react-scripts test --transformIgnorePatterns 'node_modules/(?!axios)/'",
-    "test:e2e": "cross-env START_SERVER_AND_TEST_INSECURE=1 PORT=3000 npm run rune2etests",
-    "rune2etests": "start-server-and-test 'node e2e/test-environment-setup.js' http://localhost:8000/health prod 3000 \"cd e2e && jest\"",
+    "test:e2e": "start-server-and-test 'node e2e/test-environment-setup.js' http://localhost:8000/health prod 3000 \"cd e2e && jest\"",
     "eject": "react-scripts eject"
   },
   "eslintConfig": {