diff --git a/midpoint/docker-compose.yml b/midpoint/docker-compose.yml
index 191414d..32d8ee1 100644
--- a/midpoint/docker-compose.yml
+++ b/midpoint/docker-compose.yml
@@ -1,10 +1,3 @@
-#
-# Building:
-#  - docker-compose up --build
-#
-# It assumes that midpoint-3.9-SNAPSHOT-dist.tar.gz is present in the 'midpoint-server' directory. (TODO: eliminate this!)
-#
-
 version: "3.3"
 
 services:
@@ -15,7 +8,10 @@ services:
     networks:
      - back
     volumes:
-     - midpoint_data:/var/lib/mysql
+     - midpoint_mysql:/var/lib/mysql
+     - midpoint_data:/var/lib/mysqlmounted
+    environment:
+     - CREATE_NEW_DATABASE=if_needed
 
   midpoint-server:
     build: ./midpoint-server/
@@ -77,5 +73,6 @@ secrets:
     file: ./configs-and-secrets/midpoint/application/keystore_password.txt
     
 volumes:
+  midpoint_mysql:
   midpoint_data:
   midpoint_home:
diff --git a/midpoint/midpoint-server/Dockerfile b/midpoint/midpoint-server/Dockerfile
index 4119876..27b026b 100644
--- a/midpoint/midpoint-server/Dockerfile
+++ b/midpoint/midpoint-server/Dockerfile
@@ -86,8 +86,8 @@ ENV LOGOUT_URL https://localhost:8443/Shibboleth.sso/Logout
 
 ENV KEYSTORE_PASSWORD_FILE /run/secrets/m_keystore_password.txt
 ENV MEM 2048m
-ENV TIER_RELEASE=not-released-yet
-ENV TIER_MAINTAINER=tier
+ENV TIER_RELEASE not-released-yet
+ENV TIER_MAINTAINER tier
 
 # TIER Beacon Opt-out
 # Completely uncomment the following ENV line to prevent the containers from sending analytics information to Internet2.
diff --git a/midpoint/test.sh b/midpoint/test.sh
index c1cf894..93533d3 100755
--- a/midpoint/test.sh
+++ b/midpoint/test.sh
@@ -35,12 +35,12 @@ test/t120-add-get-user.sh
 ok "OK"
 echo
 
-heading "Test 200: Stop/start cycle..."
-test/t200-stop-start.sh
-ok "OK"
-echo
-
-#heading "Test 300: Checking repository preservation across compose down/up..."
-#test/t300-repository-preservation.sh
+#heading "Test 200: Stop/start cycle..."
+#test/t200-stop-start.sh
 #ok "OK"
 #echo
+
+heading "Test 300: Checking repository preservation across compose down/up..."
+test/t300-repository-preservation.sh
+ok "OK"
+echo