diff --git a/testapp/certman-istio-operator/Dockerfile b/testapp/certman-istio-operator/Dockerfile
index c20afa7..b06bc15 100644
--- a/testapp/certman-istio-operator/Dockerfile
+++ b/testapp/certman-istio-operator/Dockerfile
@@ -1,3 +1,5 @@
 FROM flant/shell-operator:latest
-ADD hooks /hooks
-ADD cleanup.sh /
+RUN echo -e "root:x:0:0:root:/:\nappuser:x:1000:1000:appuser:/:" > /etc/passwd
+RUN echo -e "root:x:0:root\nappuser:x:1000:" > /etc/group
+ADD app /
+USER appuser
diff --git a/testapp/certman-istio-operator/cleanup.sh b/testapp/certman-istio-operator/app/cleanup.sh
similarity index 100%
rename from testapp/certman-istio-operator/cleanup.sh
rename to testapp/certman-istio-operator/app/cleanup.sh
diff --git a/testapp/certman-istio-operator/hooks/common/functions.sh b/testapp/certman-istio-operator/app/hooks/common/functions.sh
similarity index 100%
rename from testapp/certman-istio-operator/hooks/common/functions.sh
rename to testapp/certman-istio-operator/app/hooks/common/functions.sh
diff --git a/testapp/certman-istio-operator/hooks/ingress-add.sh b/testapp/certman-istio-operator/app/hooks/ingress-add.sh
similarity index 100%
rename from testapp/certman-istio-operator/hooks/ingress-add.sh
rename to testapp/certman-istio-operator/app/hooks/ingress-add.sh
diff --git a/testapp/certman-istio-operator/hooks/ingress-delete.sh b/testapp/certman-istio-operator/app/hooks/ingress-delete.sh
similarity index 100%
rename from testapp/certman-istio-operator/hooks/ingress-delete.sh
rename to testapp/certman-istio-operator/app/hooks/ingress-delete.sh