diff --git a/core/bin/kopano-admin b/core/bin/kopano-admin
new file mode 100755
index 0000000..b722fbd
--- /dev/null
+++ b/core/bin/kopano-admin
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/sbin/kopano-admin --config /tmp/kopano/admin.cfg "$@"
diff --git a/core/bin/kopano-cli b/core/bin/kopano-cli
new file mode 100755
index 0000000..c57a01c
--- /dev/null
+++ b/core/bin/kopano-cli
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/sbin/kopano-cli --config /tmp/kopano/admin.cfg "$@"
diff --git a/core/bin/kopano-create-missing-stores.sh b/core/bin/kopano-create-missing-stores.sh
new file mode 100755
index 0000000..5296672
--- /dev/null
+++ b/core/bin/kopano-create-missing-stores.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+for kuser in $(kopano-storeadm -O | grep -A999999999 "Entities without stores:" | tail -n +4 | awk '{print $2}'); do
+	kopano-storeadm -n "$kuser" -C
+done
diff --git a/core/bin/kopano-storeadm b/core/bin/kopano-storeadm
new file mode 100755
index 0000000..ba630d1
--- /dev/null
+++ b/core/bin/kopano-storeadm
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/sbin/kopano-storeadm -c /tmp/kopano/admin.cfg "$@"
diff --git a/scheduler/start.sh b/scheduler/start.sh
index cf6082d..d24ab64 100755
--- a/scheduler/start.sh
+++ b/scheduler/start.sh
@@ -23,7 +23,8 @@ done
 dockerize \
 	-wait tcp://kopano_server:236 \
 	-timeout 360s
-echo "creating public store"
+
+echo "Creating public store"
 docker exec kopano_server kopano-storeadm -h default: -P || true
 
 echo "Running sheduled cron jobs once"
diff --git a/tests/startup-test/test.sh b/tests/startup-test/test.sh
index 8788997..e82be8e 100755
--- a/tests/startup-test/test.sh
+++ b/tests/startup-test/test.sh
@@ -29,9 +29,13 @@ docker exec kopano_server kopano-storeadm -h default: -P || true
 
 docker exec kopano_server kopano-admin --sync
 docker exec kopano_server kopano-cli --list-users
+docker exec kopano_server kopano-storeadm -O # list users without a store
 docker exec kopano_server kopano-admin -l
 docker exec kopano_zpush z-push-admin -a list
 docker exec kopano_zpush z-push-gabsync -a sync
 
-# will print nothing if store exists and fail if it doen't
+# FIXME temporary workaround for issue where kopano-admin --sync is not properly creating stores
+docker exec kopano_server kopano-create-missing-stores.sh || true
+
+# will print nothing if store exists and fail if it doesn't
 docker exec kopano_server kopano-admin --details user1 | grep -q "^Store GUID:"
diff --git a/zpush/Dockerfile b/zpush/Dockerfile
index e64de78..142327c 100644
--- a/zpush/Dockerfile
+++ b/zpush/Dockerfile
@@ -47,7 +47,7 @@ RUN \
     curl -s -S -L -o - "${KOPANO_ZPUSH_REPOSITORY_URL}/Release.key" | apt-key add - && \
     # install
     set -x && \
-    # TODO set IGNORE_FIXSTATES_ON_UPGRADE https://jira.z-hub.io/browse/ZP-1164?jql=text%20~%20%22IGNORE_FIXSTATES_ON_UPGRADE%22
+    # TODO set IGNORE_FIXSTATES_ON_UPGRADE https://jira.z-hub.io/browse/ZP-1164
     apt-get update && apt-get install -y --no-install-recommends \
         apache2 \
         libapache2-mod-php7.0 \