diff --git a/.github/workflows/workflows.yaml b/.github/workflows/workflows.yaml
index 0a5cfd13..c19f9aba 100644
--- a/.github/workflows/workflows.yaml
+++ b/.github/workflows/workflows.yaml
@@ -44,17 +44,11 @@ jobs:
       - name: Setup Docker Swarm
         run: docker swarm init
       - name: Pull Image
-        run: docker pull openanalytics/shinyproxy-demo:latest
+        run: docker pull openanalytics/shinyproxy-integration-test-app
       - name: Run redis
         run: docker run -d -p 6379:6379 redis
       - name: Build with Maven
         run: mvn -B -U clean install -DskipTests
-      - name: Copy Artifact
-        run: cp target/containerproxy-*-exec.jar target/containerproxy-app-recovery.jar
-      - name: debug
-        run: |
-          docker ps -a
-          kubectl get pod -A
       - name: Run Tests
         run:  mvn -B test
 
diff --git a/src/test/java/eu/openanalytics/containerproxy/test/e2e/app_recovery/TestAppRecovery.java b/src/test/java/eu/openanalytics/containerproxy/test/e2e/app_recovery/TestAppRecovery.java
index f8a6fa7a..25a41c4f 100644
--- a/src/test/java/eu/openanalytics/containerproxy/test/e2e/app_recovery/TestAppRecovery.java
+++ b/src/test/java/eu/openanalytics/containerproxy/test/e2e/app_recovery/TestAppRecovery.java
@@ -174,7 +174,7 @@ public void complex_recover_multiple_apps_after_shutdown(String backend, Map<Str
                 originalProxies2 = clientDemo2.getProxies();
                 Assertions.assertNotNull(originalProxies2);
 
-                // 6. create two proxies for user demo333
+                // 6. create two proxies for user demo3
                 id5 = clientDemo3.startProxy("01_hello");
                 Assertions.assertNotNull(id5);
 
diff --git a/src/test/java/eu/openanalytics/containerproxy/test/helpers/NotInternalOnlyTestStrategy.java b/src/test/java/eu/openanalytics/containerproxy/test/helpers/NotInternalOnlyTestStrategy.java
index 55298c55..91ebae4f 100644
--- a/src/test/java/eu/openanalytics/containerproxy/test/helpers/NotInternalOnlyTestStrategy.java
+++ b/src/test/java/eu/openanalytics/containerproxy/test/helpers/NotInternalOnlyTestStrategy.java
@@ -22,6 +22,7 @@
 
 import eu.openanalytics.containerproxy.backend.strategy.IProxyTestStrategy;
 import eu.openanalytics.containerproxy.model.runtime.Proxy;
+import eu.openanalytics.containerproxy.service.StructuredLogger;
 import eu.openanalytics.containerproxy.util.Retrying;
 
 import java.net.HttpURLConnection;
@@ -31,6 +32,8 @@
 
 public class NotInternalOnlyTestStrategy implements IProxyTestStrategy {
 
+    private final StructuredLogger log = StructuredLogger.create(getClass());
+
 	@Override
 	public boolean testProxy(Proxy proxy) {
 		URI targetURI = proxy.getContainers().get(0).getTargets().get(proxy.getId());
@@ -48,7 +51,9 @@ public boolean testProxy(Proxy proxy) {
 				if (Arrays.asList(200, 301, 302, 303, 307, 308).contains(responseCode)) {
 					return true;
 				}
+                log.warn(proxy, "Error during test strategy test: status code: " + responseCode);
 			} catch (Exception e) {
+                log.warn(proxy, e, "Exception during test strategy");
                 return false;
 			}
 			return false;
diff --git a/src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnKube.java b/src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnKube.java
index 4a87c29d..69b507ff 100644
--- a/src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnKube.java
+++ b/src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnKube.java
@@ -91,7 +91,7 @@ public void launchProxy() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
             Assertions.assertFalse(pod.getSpec().getContainers().get(0).getSecurityContext().getPrivileged());
 
             ServiceList serviceList = k8s.client.services().inNamespace(k8s.namespace).list();
@@ -108,8 +108,7 @@ public void launchProxy() {
             // all pods should be deleted
             assertNoPods(k8s);
             // all services should be deleted
-            serviceList = k8s.client.services().inNamespace(k8s.namespace).list();
-            Assertions.assertEquals(0, serviceList.getItems().size());
+            assertNoServices(k8s);
         }
     }
 
@@ -133,7 +132,7 @@ public void launchProxyWithVolumes() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // Check Volumes
             Assertions.assertTrue(pod.getSpec().getVolumes().size() >= 2); // at least two volumes should be created
@@ -178,7 +177,7 @@ public void launchProxyWithEnv() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // Check Env Variables
             List<EnvVar> envList = pod.getSpec().getContainers().get(0).getEnv();
@@ -221,7 +220,7 @@ public void launchProxyWithSecretRef() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // Check Env Variables
             List<EnvVar> envList = pod.getSpec().getContainers().get(0).getEnv();
@@ -253,7 +252,7 @@ public void launchProxyWithResources() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // Check Resource limits/requests
             ResourceRequirements req = pod.getSpec().getContainers().get(0).getResources();
@@ -286,7 +285,7 @@ public void launchProxyWithPrivileged() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             Assertions.assertTrue(pod.getSpec().getContainers().get(0).getSecurityContext().getPrivileged());
 
@@ -334,7 +333,7 @@ public void launchProxyWithPodPatches() {
                 Assertions.assertEquals(serviceAccountName, pod.getSpec().getServiceAccount());
                 ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
                 Assertions.assertEquals(true, container.getReady());
-                Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+                Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
                 serviceList = k8s.client.services().inNamespace(k8s.overriddenNamespace).list();
                 Assertions.assertEquals(1, serviceList.getItems().size());
@@ -351,8 +350,7 @@ public void launchProxyWithPodPatches() {
                 assertNoPods(k8s);
 
                 // all services should be deleted
-                serviceList = k8s.client.services().inNamespace(k8s.overriddenNamespace).list();
-                Assertions.assertEquals(0, serviceList.getItems().size());
+                assertNoServices(k8s);
             } finally {
                 k8s.client.serviceAccounts().withName(serviceAccountName).delete();
             }
@@ -379,7 +377,7 @@ public void launchProxyWithPatchesWithMerging() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // Check volumes: one HostPath is added using SP and one using patches
             Assertions.assertTrue(pod.getSpec().getVolumes().size() >= 2); // at least two volumes should be created
@@ -425,7 +423,7 @@ public void launchProxyWithAdditionalManifests() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             PersistentVolumeClaimList claimList = k8s.client.persistentVolumeClaims().inNamespace(k8s.overriddenNamespace).list();
             Assertions.assertEquals(1, claimList.getItems().size());
@@ -444,8 +442,8 @@ public void launchProxyWithAdditionalManifests() {
             assertNoPods(k8s);
 
             // all additional manifests should be deleted
-            Assertions.assertEquals(0, k8s.getSecrets(k8s.overriddenNamespace).size());
-            Assertions.assertEquals(0, k8s.client.persistentVolumeClaims().inNamespace(k8s.overriddenNamespace).list().getItems().size());
+            assertNoSecrets(k8s);
+            assertNoPvcs(k8s);
         }
     }
 
@@ -491,7 +489,7 @@ public void launchProxyWithAdditionalManifestsOfWhichOneAlreadyExists() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             PersistentVolumeClaimList claimList = k8s.client.persistentVolumeClaims().inNamespace(k8s.overriddenNamespace).list();
             Assertions.assertEquals(1, claimList.getItems().size());
@@ -512,7 +510,7 @@ public void launchProxyWithAdditionalManifestsOfWhichOneAlreadyExists() {
             assertNoPods(k8s);
 
             // the secret additional manifests should be deleted
-            Assertions.assertEquals(0, k8s.getSecrets(k8s.overriddenNamespace).size());
+            assertNoSecrets(k8s);
             // the pvc should still exist, shinyproxy does not delete it because it was not created by shinyproxy
             // using sp-additional-manifest-policy: Patch it will be patched and deleted, see test launchProxyWithManifestPolicyPatch case 2
             Assertions.assertEquals(1, k8s.client.persistentVolumeClaims().inNamespace(k8s.overriddenNamespace).list().getItems().size());
@@ -539,7 +537,7 @@ public void launchProxyWithExpressionInPatchAndManifests() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
 
             // check env variables
@@ -567,7 +565,7 @@ public void launchProxyWithExpressionInPatchAndManifests() {
             assertNoPods(k8s);
 
             // all additional manifests should be deleted
-            Assertions.assertEquals(0, k8s.client.persistentVolumeClaims().inNamespace(k8s.namespace).list().getItems().size());
+            assertNoPvcs(k8s);
         }
     }
 
@@ -593,7 +591,7 @@ public void launchProxyWithAdditionalPersistentManifests() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             PersistentVolumeClaimList claimList = k8s.client.persistentVolumeClaims().inNamespace(k8s.overriddenNamespace).list();
             Assertions.assertEquals(1, claimList.getItems().size());
@@ -611,7 +609,7 @@ public void launchProxyWithAdditionalPersistentManifests() {
             // all pods should be deleted
             assertNoPods(k8s);
             // the secret should be deleted
-            Assertions.assertEquals(0, k8s.getSecrets(k8s.overriddenNamespace).size());
+            assertNoSecrets(k8s);
 
             // the PVC should not be deleted
             Assertions.assertEquals(1, k8s.client.persistentVolumeClaims().inNamespace(k8s.overriddenNamespace).list().getItems().size());
@@ -636,7 +634,7 @@ public void launchProxyWithManifestPolicyCreateOnce() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // secret has no namespace defined -> should be created in the default namespace
             Secret secret = k8s.getSingleSecret(k8s.namespace);
@@ -650,7 +648,7 @@ public void launchProxyWithManifestPolicyCreateOnce() {
             // all pods should be deleted
             assertNoPods(k8s);
             // the secret should be deleted
-            Assertions.assertEquals(0, k8s.getSecrets(k8s.overriddenNamespace).size());
+            assertNoSecrets(k8s);
         }
         // case 2: secret does already exist, check that it does not get overridden
         try (ContainerSetup k8s = new ContainerSetup("kubernetes")) {
@@ -680,7 +678,7 @@ public void launchProxyWithManifestPolicyCreateOnce() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // secret has no namespace defined -> should be created in the default namespace
             Secret secret = k8s.getSingleSecret(k8s.namespace);
@@ -694,7 +692,7 @@ public void launchProxyWithManifestPolicyCreateOnce() {
             // all pods should be deleted
             assertNoPods(k8s);
             // the secret should be deleted
-            Assertions.assertEquals(0, k8s.getSecrets(k8s.namespace).size());
+            assertNoSecrets(k8s);
         }
     }
 
@@ -715,7 +713,7 @@ public void launchProxyWithManifestPolicyPatch() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // secret has no namespace defined -> should be created in the default namespace
             Secret secret = k8s.getSingleSecret(k8s.namespace);
@@ -729,7 +727,7 @@ public void launchProxyWithManifestPolicyPatch() {
             // all pods should be deleted
             assertNoPods(k8s);
             // the secret should be deleted
-            Assertions.assertEquals(0, k8s.getSecrets(k8s.namespace).size());
+            assertNoSecrets(k8s);
         }
 
         // case 2: secret does already exist, check that it gets overridden
@@ -759,7 +757,7 @@ public void launchProxyWithManifestPolicyPatch() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // secret has no namespace defined -> should be created in the default namespace
             Secret secret = k8s.getSingleSecret(k8s.namespace);
@@ -775,7 +773,7 @@ public void launchProxyWithManifestPolicyPatch() {
             // all pods should be deleted
             assertNoPods(k8s);
             // the secret should be deleted
-            Assertions.assertEquals(0, k8s.getSecrets(k8s.overriddenNamespace).size());
+            assertNoSecrets(k8s);
         }
     }
 
@@ -805,10 +803,10 @@ public void launchProxyWithManifestPolicyDelete() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // the secret should be deleted
-            Assertions.assertEquals(0, k8s.getSecrets(k8s.overriddenNamespace).size());
+            assertNoSecrets(k8s);
 
             inst.proxyService.stopProxy(null, proxy, true).run();
 
@@ -834,7 +832,7 @@ public void launchProxyWithManifestPolicyReplace() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // secret has no namespace defined -> should be created in the default namespace
             Secret secret = k8s.getSingleSecret(k8s.namespace);
@@ -848,7 +846,7 @@ public void launchProxyWithManifestPolicyReplace() {
             // all pods should be deleted
             assertNoPods(k8s);
             // the secret should be deleted
-            Assertions.assertEquals(0, k8s.getSecrets(k8s.overriddenNamespace).size());
+            assertNoSecrets(k8s);
         }
 
         // case 2: secret does already exist, check that it gets overridden
@@ -880,7 +878,7 @@ public void launchProxyWithManifestPolicyReplace() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // secret has no namespace defined -> should be created in the default namespace
             Secret secret = k8s.getSingleSecret(k8s.namespace);
@@ -896,7 +894,7 @@ public void launchProxyWithManifestPolicyReplace() {
             // all pods should be deleted
             assertNoPods(k8s);
             // the secret should be deleted
-            Assertions.assertEquals(0, k8s.getSecrets(k8s.overriddenNamespace).size());
+            assertNoSecrets(k8s);
         }
     }
 
@@ -917,7 +915,7 @@ public void launchProxyWithPersistentManifestPolicyCreateOnce() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // secret has no namespace defined -> should be created in the default namespace
             Secret secret = k8s.getSingleSecret(k8s.namespace);
@@ -974,7 +972,7 @@ public void launchProxyWithPersistentManifestPolicyPatch() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // secret has no namespace defined -> should be created in the default namespace
             Secret secret = k8s.getSingleSecret(k8s.namespace);
@@ -1040,10 +1038,10 @@ public void launchProxyWithPersistentManifestPolicyDelete() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // the secret should be deleted
-            Assertions.assertEquals(0, k8s.getSecrets(k8s.overriddenNamespace).size());
+            assertNoSecrets(k8s);
 
             inst.proxyService.stopProxy(null, proxy, true).run();
 
@@ -1069,7 +1067,7 @@ public void launchProxyWithPersistentManifestPolicyReplace() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             // secret has no namespace defined -> should be created in the default namespace
             Secret secret = k8s.getSingleSecret(k8s.namespace);
@@ -1129,7 +1127,7 @@ public void advancedRuntimeLabels() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
             Assertions.assertFalse(pod.getSpec().getContainers().get(0).getSecurityContext().getPrivileged());
 
             ServiceList serviceList = k8s.client.services().inNamespace(k8s.namespace).list();
@@ -1174,8 +1172,7 @@ public void advancedRuntimeLabels() {
             assertNoPods(k8s);
 
             // all services should be deleted
-            serviceList = k8s.client.services().inNamespace(k8s.namespace).list();
-            Assertions.assertEquals(0, serviceList.getItems().size());
+            assertNoServices(k8s);
         }
     }
 
@@ -1323,7 +1320,7 @@ public void launchProxyWithParametersFinalResolve() {
 
             // env vars that should be resolved during the final resolve:
             Assertions.assertTrue(env.containsKey("HEARTBEAT_TIMEOUT"));
-            Assertions.assertEquals("70", env.get("HEARTBEAT_TIMEOUT").getValue());
+            Assertions.assertEquals("160000", env.get("HEARTBEAT_TIMEOUT").getValue());
             Assertions.assertTrue(env.containsKey("MAX_LIFETIME"));
             Assertions.assertEquals("-1", env.get("MAX_LIFETIME").getValue());
             Assertions.assertTrue(env.containsKey("MEMORY_LIMIT"));
@@ -1334,7 +1331,7 @@ public void launchProxyWithParametersFinalResolve() {
             // labels that should be resolved during the final resolve:
             Map<String, String> labels = pod.getMetadata().getLabels();
             Assertions.assertTrue(labels.containsKey("HEARTBEAT_TIMEOUT"));
-            Assertions.assertEquals("70", labels.get("HEARTBEAT_TIMEOUT"));
+            Assertions.assertEquals("160000", labels.get("HEARTBEAT_TIMEOUT"));
 
             inst.proxyService.stopProxy(null, proxy, true).run();
 
@@ -1364,7 +1361,7 @@ public void launchProxyWithAdditionalPersistentManifestsUsingAuthObjects() {
             Assertions.assertEquals(1, pod.getStatus().getContainerStatuses().size());
             ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
             Assertions.assertEquals(true, container.getReady());
-            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-demo:latest"));
+            Assertions.assertTrue(container.getImage().endsWith("openanalytics/shinyproxy-integration-test-app:latest"));
 
             ConfigMap configMap1 = k8s.client.configMaps().inNamespace(k8s.overriddenNamespace).withName("configmap1").get();
             Assertions.assertTrue(configMap1.getData().containsKey("test.txt"));
@@ -1398,4 +1395,31 @@ private void assertNoPods(ContainerSetup k8s) {
         Assertions.assertEquals(0, inst.proxyService.getProxies(null, true).size());
     }
 
+    private void assertNoPvcs(ContainerSetup k8s) {
+        boolean cleanedUp = Retrying.retry((c, m) -> {
+            List<PersistentVolumeClaim> pods1 = k8s.client.persistentVolumeClaims().inNamespace(k8s.namespace).list().getItems();
+            List<PersistentVolumeClaim> pods2 = k8s.client.persistentVolumeClaims().inNamespace(k8s.overriddenNamespace).list().getItems();
+            return pods1.isEmpty() && pods2.isEmpty();
+        }, 5_000, "assert no pvcs", 1, true);
+        Assertions.assertTrue(cleanedUp);
+    }
+
+    private void assertNoSecrets(ContainerSetup k8s) {
+        boolean cleanedUp = Retrying.retry((c, m) -> {
+            List<Secret> pods1 = k8s.getSecrets(k8s.namespace);
+            List<Secret> pods2 = k8s.getSecrets(k8s.overriddenNamespace);
+            return pods1.isEmpty() && pods2.isEmpty();
+        }, 5_000, "assert no secrets", 1, true);
+        Assertions.assertTrue(cleanedUp);
+    }
+
+    private void assertNoServices(ContainerSetup k8s) {
+        boolean cleanedUp = Retrying.retry((c, m) -> {
+            List<Service> pods1 = k8s.client.services().inNamespace(k8s.namespace).list().getItems();
+            List<Service> pods2 = k8s.client.services().inNamespace(k8s.overriddenNamespace).list().getItems();
+            return pods1.isEmpty() && pods2.isEmpty();
+        }, 5_000, "assert no secrets", 1, true);
+        Assertions.assertTrue(cleanedUp);
+    }
+
 }
diff --git a/src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnSwarm.java b/src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnSwarm.java
index 6f9ef987..1b56a90d 100644
--- a/src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnSwarm.java
+++ b/src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnSwarm.java
@@ -58,7 +58,7 @@ public void launchProxy() throws DockerCertificateException, DockerException, In
                 List<Service> services = dockerClient.listServices();
                 Assertions.assertEquals(1, services.size());
                 Service service = services.get(0);
-                Assertions.assertEquals("openanalytics/shinyproxy-demo", service.spec().taskTemplate().containerSpec().image());
+                Assertions.assertEquals("openanalytics/shinyproxy-integration-test-app", service.spec().taskTemplate().containerSpec().image());
 
                 inst.proxyService.stopProxy(null, proxy, true).run();
             }
@@ -85,7 +85,7 @@ public void launchProxyWithSecret() throws DockerCertificateException, DockerExc
                 List<Service> services = dockerClient.listServices();
                 Assertions.assertEquals(1, services.size());
                 Service service = services.get(0);
-                Assertions.assertEquals("openanalytics/shinyproxy-demo", service.spec().taskTemplate().containerSpec().image());
+                Assertions.assertEquals("openanalytics/shinyproxy-integration-test-app", service.spec().taskTemplate().containerSpec().image());
 
                 SecretBind secret1 = service.spec().taskTemplate().containerSpec().secrets().get(0);
 
diff --git a/src/test/resources/application-app-recovery_docker-swarm.yml b/src/test/resources/application-app-recovery_docker-swarm.yml
index d1f4f13f..788607e5 100644
--- a/src/test/resources/application-app-recovery_docker-swarm.yml
+++ b/src/test/resources/application-app-recovery_docker-swarm.yml
@@ -18,21 +18,21 @@ proxy:
   specs:
     - id: 01_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 02_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 03_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-app-recovery_docker-swarm_2.yml b/src/test/resources/application-app-recovery_docker-swarm_2.yml
index ff4b5e3c..efe0b9e0 100644
--- a/src/test/resources/application-app-recovery_docker-swarm_2.yml
+++ b/src/test/resources/application-app-recovery_docker-swarm_2.yml
@@ -23,21 +23,21 @@ proxy:
   specs:
     - id: 01_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 02_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 03_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-app-recovery_docker.yml b/src/test/resources/application-app-recovery_docker.yml
index 8dad3b9b..fb660abf 100644
--- a/src/test/resources/application-app-recovery_docker.yml
+++ b/src/test/resources/application-app-recovery_docker.yml
@@ -21,21 +21,21 @@ proxy:
   specs:
     - id: 01_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 02_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 03_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-app-recovery_docker_2.yml b/src/test/resources/application-app-recovery_docker_2.yml
index a97e010f..6827b765 100644
--- a/src/test/resources/application-app-recovery_docker_2.yml
+++ b/src/test/resources/application-app-recovery_docker_2.yml
@@ -23,21 +23,21 @@ proxy:
   specs:
     - id: 01_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 02_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 03_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-app-recovery_kubernetes.yml b/src/test/resources/application-app-recovery_kubernetes.yml
index a99af395..5ce369ac 100644
--- a/src/test/resources/application-app-recovery_kubernetes.yml
+++ b/src/test/resources/application-app-recovery_kubernetes.yml
@@ -18,21 +18,21 @@ proxy:
   specs:
     - id: 01_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
            - name: default
              port: 3838
     - id: 02_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 03_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-app-recovery_kubernetes_2.yml b/src/test/resources/application-app-recovery_kubernetes_2.yml
index 6c27e767..db8406db 100644
--- a/src/test/resources/application-app-recovery_kubernetes_2.yml
+++ b/src/test/resources/application-app-recovery_kubernetes_2.yml
@@ -19,21 +19,21 @@ proxy:
   specs:
     - id: 01_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 02_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 03_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-app-recovery_kubernetes_multi_ns.yml b/src/test/resources/application-app-recovery_kubernetes_multi_ns.yml
index 9aa9c5c8..b0d60f6f 100644
--- a/src/test/resources/application-app-recovery_kubernetes_multi_ns.yml
+++ b/src/test/resources/application-app-recovery_kubernetes_multi_ns.yml
@@ -20,14 +20,14 @@ proxy:
   specs:
     - id: 01_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 02_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
@@ -38,7 +38,7 @@ proxy:
           value: itest-overridden
     - id: 03_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-app-recovery_kubernetes_normal_shutdown.yml b/src/test/resources/application-app-recovery_kubernetes_normal_shutdown.yml
index 6b77a6f3..b166cc08 100644
--- a/src/test/resources/application-app-recovery_kubernetes_normal_shutdown.yml
+++ b/src/test/resources/application-app-recovery_kubernetes_normal_shutdown.yml
@@ -18,21 +18,21 @@ proxy:
   specs:
     - id: 01_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 02_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: 03_hello
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-parameters-validation-1.yaml b/src/test/resources/application-parameters-validation-1.yaml
index fb168d75..9f80d79f 100644
--- a/src/test/resources/application-parameters-validation-1.yaml
+++ b/src/test/resources/application-parameters-validation-1.yaml
@@ -22,7 +22,7 @@ proxy:
   specs:
     - id: big-parameters
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-parameters-validation-10.yaml b/src/test/resources/application-parameters-validation-10.yaml
index 9b7cddcf..e99682c4 100644
--- a/src/test/resources/application-parameters-validation-10.yaml
+++ b/src/test/resources/application-parameters-validation-10.yaml
@@ -22,7 +22,7 @@ proxy:
   specs:
     - id: big-parameters
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-parameters-validation-2.yaml b/src/test/resources/application-parameters-validation-2.yaml
index 884e520a..f14b4ded 100644
--- a/src/test/resources/application-parameters-validation-2.yaml
+++ b/src/test/resources/application-parameters-validation-2.yaml
@@ -22,7 +22,7 @@ proxy:
   specs:
     - id: big-parameters
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-parameters-validation-3.yaml b/src/test/resources/application-parameters-validation-3.yaml
index 3f9dbabd..7bbe3c4f 100644
--- a/src/test/resources/application-parameters-validation-3.yaml
+++ b/src/test/resources/application-parameters-validation-3.yaml
@@ -22,7 +22,7 @@ proxy:
   specs:
     - id: big-parameters
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-parameters-validation-4.yaml b/src/test/resources/application-parameters-validation-4.yaml
index 38601740..440c86da 100644
--- a/src/test/resources/application-parameters-validation-4.yaml
+++ b/src/test/resources/application-parameters-validation-4.yaml
@@ -22,7 +22,7 @@ proxy:
   specs:
     - id: big-parameters
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-parameters-validation-5.yaml b/src/test/resources/application-parameters-validation-5.yaml
index 74ef2edd..93c5605c 100644
--- a/src/test/resources/application-parameters-validation-5.yaml
+++ b/src/test/resources/application-parameters-validation-5.yaml
@@ -22,7 +22,7 @@ proxy:
   specs:
     - id: big-parameters
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-parameters-validation-6.yaml b/src/test/resources/application-parameters-validation-6.yaml
index c12968fb..d5d56db5 100644
--- a/src/test/resources/application-parameters-validation-6.yaml
+++ b/src/test/resources/application-parameters-validation-6.yaml
@@ -22,7 +22,7 @@ proxy:
   specs:
     - id: big-parameters
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-parameters-validation-7.yaml b/src/test/resources/application-parameters-validation-7.yaml
index 3a4675d7..2dada08f 100644
--- a/src/test/resources/application-parameters-validation-7.yaml
+++ b/src/test/resources/application-parameters-validation-7.yaml
@@ -22,7 +22,7 @@ proxy:
   specs:
     - id: big-parameters
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-parameters-validation-8.yaml b/src/test/resources/application-parameters-validation-8.yaml
index ed446305..907dcd29 100644
--- a/src/test/resources/application-parameters-validation-8.yaml
+++ b/src/test/resources/application-parameters-validation-8.yaml
@@ -22,7 +22,7 @@ proxy:
   specs:
     - id: big-parameters
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-parameters-validation-9.yaml b/src/test/resources/application-parameters-validation-9.yaml
index e6837035..ec30d78e 100644
--- a/src/test/resources/application-parameters-validation-9.yaml
+++ b/src/test/resources/application-parameters-validation-9.yaml
@@ -22,7 +22,7 @@ proxy:
   specs:
     - id: big-parameters
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-parameters.yaml b/src/test/resources/application-parameters.yaml
index 07b09b19..2c8a1b49 100644
--- a/src/test/resources/application-parameters.yaml
+++ b/src/test/resources/application-parameters.yaml
@@ -22,7 +22,7 @@ proxy:
   specs:
     - id: big-parameters
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
@@ -177,14 +177,14 @@ proxy:
                 - "yes"
     - id: no-parameters
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
               port: 3838
     - id: with-access-control
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
@@ -231,7 +231,7 @@ proxy:
                 - jeff
     - id: default-values
       container-specs:
-        - image: "openanalytics/shinyproxy-demo"
+        - image: "openanalytics/shinyproxy-integration-test-app"
           cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
           port-mapping:
             - name: default
diff --git a/src/test/resources/application-test-ecs.yml b/src/test/resources/application-test-ecs.yml
index 3845cc65..a44c8a63 100644
--- a/src/test/resources/application-test-ecs.yml
+++ b/src/test/resources/application-test-ecs.yml
@@ -22,14 +22,14 @@ proxy:
   specs:
   - id: 01_hello
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
           port: 3838
   - id: 01_hello_secret
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
         port-mapping:
           - name: default
diff --git a/src/test/resources/application-test-no-auth.yml b/src/test/resources/application-test-no-auth.yml
index 4e9b3fc2..acdc7cdf 100644
--- a/src/test/resources/application-test-no-auth.yml
+++ b/src/test/resources/application-test-no-auth.yml
@@ -10,7 +10,7 @@ proxy:
   specs:
   - id: 01_hello
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
diff --git a/src/test/resources/application-test-swarm.yml b/src/test/resources/application-test-swarm.yml
index 3845cc65..a44c8a63 100644
--- a/src/test/resources/application-test-swarm.yml
+++ b/src/test/resources/application-test-swarm.yml
@@ -22,14 +22,14 @@ proxy:
   specs:
   - id: 01_hello
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
           port: 3838
   - id: 01_hello_secret
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
         port-mapping:
           - name: default
diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml
index 34681e5a..415a25db 100644
--- a/src/test/resources/application-test.yml
+++ b/src/test/resources/application-test.yml
@@ -8,7 +8,7 @@ spring:
 proxy:
   authentication: simple
   container-backend: kubernetes
-
+  heartbeat-timeout: -1
 
   users:
   - name: demo
@@ -26,14 +26,14 @@ proxy:
   specs:
   - id: 01_hello
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
           port: 3838
   - id: 01_hello_volume
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
@@ -43,7 +43,7 @@ proxy:
        - "/srv/myvolume2:/srv/myvolume2"
   - id: 01_hello_env
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
@@ -54,7 +54,7 @@ proxy:
         VAR3: VALUE3
   - id: 01_hello_secret
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
@@ -63,7 +63,7 @@ proxy:
         MY_SECRET: secretKeyRef:mysecret:username
   - id: 01_hello_limits
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
@@ -74,7 +74,7 @@ proxy:
       memory-limit: "2Gi"
   - id: 01_hello_priv
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
@@ -82,7 +82,7 @@ proxy:
       privileged: true
   - id: 01_hello_patches1
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
@@ -103,7 +103,7 @@ proxy:
         value: sp-ittest-b9fa0a24-account
   - id: 01_hello_patches2
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
@@ -130,7 +130,7 @@ proxy:
           value: VALUE
   - id: 01_hello_manifests
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
@@ -163,7 +163,7 @@ proxy:
            password: cGFzc3dvcmQ=
   - id: 01_hello_manifests_espression
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
@@ -204,14 +204,14 @@ proxy:
               storage: 5Gi
   - id: 02_hello
     container-specs:
-    - image: "openanalytics/shinyproxy-demo"
+    - image: "openanalytics/shinyproxy-integration-test-app"
       cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
       port-mapping:
         - name: default
           port: 3838
   - id: 01_hello_manifests_persistent # 11
     container-specs:
-       - image: "openanalytics/shinyproxy-demo"
+       - image: "openanalytics/shinyproxy-integration-test-app"
          cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
          port-mapping:
            - name: default
@@ -245,7 +245,7 @@ proxy:
               storage: 5Gi
   - id: 01_hello_advanced_runtime_labels # 12
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
         port-mapping:
           - name: default
@@ -267,7 +267,7 @@ proxy:
        value: "#{proxy.getRuntimeValue('SHINYPROXY_INSTANCE')}"
   - id: 01_hello_manifests_policy_create_once # 13
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
         port-mapping:
           - name: default
@@ -285,7 +285,7 @@ proxy:
           password: cGFzc3dvcmQ=
   - id: 01_hello_manifests_policy_patch # 14
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
         port-mapping:
           - name: default
@@ -303,7 +303,7 @@ proxy:
           password: cGFzc3dvcmQ=
   - id: 01_hello_manifests_policy_delete # 15
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
         port-mapping:
           - name: default
@@ -321,7 +321,7 @@ proxy:
           password: cGFzc3dvcmQ=
   - id: 01_hello_manifests_policy_replace # 16
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
         port-mapping:
           - name: default
@@ -339,7 +339,7 @@ proxy:
           password: cGFzc3dvcmQ=
   - id: 01_hello_persistent_manifests_policy_create_once
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
         port-mapping:
           - name: default
@@ -357,7 +357,7 @@ proxy:
           password: cGFzc3dvcmQ=
   - id: 01_hello_persistent_manifests_policy_patch # 18
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
         port-mapping:
           - name: default
@@ -375,7 +375,7 @@ proxy:
           password: cGFzc3dvcmQ=
   - id: 01_hello_persistent_manifests_policy_patch2 # 19
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
         port-mapping:
           - name: default
@@ -393,7 +393,7 @@ proxy:
           password: b2xkX3Bhc3N3b3Jk
   - id: 01_hello_persistent_manifests_policy_delete #20
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
         port-mapping:
           - name: default
@@ -411,7 +411,7 @@ proxy:
           password: cGFzc3dvcmQ=
   - id: 01_hello_persistent_manifests_policy_replace #21
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
         port-mapping:
           - name: default
@@ -429,7 +429,7 @@ proxy:
           password: cGFzc3dvcmQ=
   - id: 01_hello_persistent_manifests_policy_replace2 # 22
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
         port-mapping:
           - name: default
@@ -615,7 +615,7 @@ proxy:
           name: ERROR
           value: "#{proxy.getRuntimeObject('SHINYPROXY_PARAMETERS').getValue('non-existing-parameter')}"
   - id: parameters-final-resolve
-    heartbeat-timeout: "#{10 + 60}"
+    heartbeat-timeout: "#{100000 + 60000}"
     container-specs:
       - image: "#{proxy.getRuntimeObject('SHINYPROXY_PARAMETERS').getValue('environment')}:#{proxy.getRuntimeObject('SHINYPROXY_PARAMETERS').getValue('version')}"
         memory-limit: "#{proxy.getRuntimeObject('SHINYPROXY_PARAMETERS').getValue('memory')}"
@@ -709,7 +709,7 @@ proxy:
           value: "#{proxy.getRuntimeObject('SHINYPROXY_PARAMETERS').getValueSetName()}"
   - id: 01_hello_manifests_persistent_using_auth
     container-specs:
-      - image: "openanalytics/shinyproxy-demo"
+      - image: "openanalytics/shinyproxy-integration-test-app"
         cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
         port-mapping:
           - name: default