diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 5bfbf74482e1f33272073afa9917fdd75f12614b..796d2d4a01ef281f52332cb4f0055a872f367b5f 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -8,8 +8,6 @@ on:
 env:
   DOCKER_IMAGE_NAME: interactive-viewer
   DOCKER_IMAGE_TAG: ${{ github.sha }}
-  DOCKER_SAVE_FILENAME: iav.tar.gz
-  ARTEFACT_NAME: iav_docker_image
   DOCKER_CONTAINER_NAME: github-actions-iav-dkr-container
 
 jobs:
@@ -26,7 +24,7 @@ jobs:
       run: |
         docker build --build-arg BACKEND_URL=${BACKEND_URL} -t ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} .
       env:
-        BACKEND_URL: http://localhost:3001
+        BACKEND_URL: http://localhost:3001/
 
   test:
     runs-on: self-hosted
@@ -40,9 +38,24 @@ jobs:
       run: |
         npm i
     - name: run docker image ${{ env.DOCKER_IMAGE_NAME }}:${{ env.DOCKER_IMAGE_TAG }}
-      run: docker run -p 3001:3000 --rm --name ${DOCKER_CONTAINER_NAME} -dit ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}
-    - name: run pptr tests
+      run: |
+        docker run -p 3001:3000 \
+          --rm \
+          --name ${DOCKER_CONTAINER_NAME} \
+          --env HBP_CLIENTID=${{ secrets.HBP_CLIENTID }} \
+          --env HBP_CLIENTSECRET=${{ secrets.HBP_CLIENTSECRET }} \
+          --env REFRESH_TOKEN=${{ secrets.REFRESH_TOKEN }} \
+          -dit \
+          ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}
+    - name: sleep for 60s
+      run: sleep 60s
+    - name: run pptr tests - ${{ env.TEST_URL }}
       run: node ./node_modules/.bin/mocha ./test/databrowser.spec.js --timeout 1800000 
-    - name: cleanup
+      env:
+        TEST_URL: http://localhost:3001
+    - name: cleanup, stop container ${{ env.DOCKER_CONTAINER_NAME }}
       if: always()
-      run: docker stop ${DOCKER_CONTAINER_NAME} && docker rmi ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}
+      run: docker stop ${DOCKER_CONTAINER_NAME}
+    - name: cleanup, remove image ${{ env.DOCKER_IMAGE_NAME }}:${{ env.DOCKER_IMAGE_TAG }}
+      if: success()
+      run: docker rmi ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}