diff --git a/e2e/Dockerfile b/e2e/Dockerfile
index a250ea9cb..c8f98440b 100644
--- a/e2e/Dockerfile
+++ b/e2e/Dockerfile
@@ -3,9 +3,12 @@
 FROM ubuntu:18.04
 LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"
 
-COPY manifests ./manifests
-COPY exec.sh ./exec.sh
-COPY requirements.txt tests ./
+
+#COPY manifests ./manifests
+#COPY exec.sh ./exec.sh
+#COPY requirements.txt tests ./
+
+COPY requirements.txt ./
 
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
@@ -20,7 +23,7 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-ARG VERSION=dev
-RUN sed -i "s/__version__ = .*/__version__ = '${VERSION}'/" ./__init__.py
+#ARG VERSION=dev
+#RUN sed -i "s/__version__ = .*/__version__ = '${VERSION}'/" /tests/__init__.py
 
 CMD ["python3", "-m", "unittest", "discover", "--start-directory", ".", "-v"]
diff --git a/e2e/run.sh b/e2e/run.sh
index 53e656c22..430699bb5 100755
--- a/e2e/run.sh
+++ b/e2e/run.sh
@@ -49,7 +49,13 @@ function set_kind_api_server_ip(){
 
 function run_tests(){
 
-  docker run --rm --mount type=bind,source="$(readlink -f ${kubeconfig_path})",target=/root/.kube/config -e OPERATOR_IMAGE="${operator_image}" "${e2e_test_image}"
+  docker run --rm \
+  --mount type=bind,source="$(readlink -f ${kubeconfig_path})",target=/root/.kube/config \
+  --mount type=bind,source="$(readlink -f manifests)",target=/manifests \
+  --mount type=bind,source="$(readlink -f tests)",target=/tests \
+  --mount type=bind,source="$(readlink -f exec.sh)",target=/exec.sh \
+  -e OPERATOR_IMAGE="${operator_image}" "${e2e_test_image}"
+  
 }
 
 function clean_up(){
diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py
index 49e7da10d..5d5751add 100644
--- a/e2e/tests/test_e2e.py
+++ b/e2e/tests/test_e2e.py
@@ -646,7 +646,7 @@ class EndToEndTestCase(unittest.TestCase):
         # wait a little before proceeding
         time.sleep(10)
 
-        # add annotations to manifest
+        # add annotations to the postgresql object
         deleteDate = datetime.today().strftime('%Y-%m-%d')
         pg_patch_delete_annotations = {
             "metadata": {