diff --git a/drydocker/libkolabxml/test_obs.sh b/drydocker/autoconf/test_obs.sh
similarity index 84%
copy from drydocker/libkolabxml/test_obs.sh
copy to drydocker/autoconf/test_obs.sh
index bd21164..bb00a8d 100755
--- a/drydocker/libkolabxml/test_obs.sh
+++ b/drydocker/autoconf/test_obs.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-pushd /srv/libkolabxml.git
+pushd /srv/${PACKAGE}.git
 
 source /srv/stick.git/drydocker/generic_obs.sh
 
 retval=$(_shell obs_build_local)
 
 if [ ${retval} -ne 0 ]; then
     exit ${retval}
 fi
 popd
diff --git a/drydocker/libkolabxml/test_obs.sh b/drydocker/copenhagen/test_obs.sh
old mode 100755
new mode 100644
similarity index 84%
copy from drydocker/libkolabxml/test_obs.sh
copy to drydocker/copenhagen/test_obs.sh
index bd21164..bb00a8d
--- a/drydocker/libkolabxml/test_obs.sh
+++ b/drydocker/copenhagen/test_obs.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-pushd /srv/libkolabxml.git
+pushd /srv/${PACKAGE}.git
 
 source /srv/stick.git/drydocker/generic_obs.sh
 
 retval=$(_shell obs_build_local)
 
 if [ ${retval} -ne 0 ]; then
     exit ${retval}
 fi
 popd
diff --git a/drydocker/freebusy/build.sh b/drydocker/kolab-freebusy/build.sh
similarity index 100%
rename from drydocker/freebusy/build.sh
rename to drydocker/kolab-freebusy/build.sh
diff --git a/drydocker/freebusy/test_build.sh b/drydocker/kolab-freebusy/test_build.sh
similarity index 100%
rename from drydocker/freebusy/test_build.sh
rename to drydocker/kolab-freebusy/test_build.sh
diff --git a/drydocker/libkolabxml/test_obs.sh b/drydocker/kolab-freebusy/test_obs.sh
similarity index 84%
copy from drydocker/libkolabxml/test_obs.sh
copy to drydocker/kolab-freebusy/test_obs.sh
index bd21164..bb00a8d 100755
--- a/drydocker/libkolabxml/test_obs.sh
+++ b/drydocker/kolab-freebusy/test_obs.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-pushd /srv/libkolabxml.git
+pushd /srv/${PACKAGE}.git
 
 source /srv/stick.git/drydocker/generic_obs.sh
 
 retval=$(_shell obs_build_local)
 
 if [ ${retval} -ne 0 ]; then
     exit ${retval}
 fi
 popd
diff --git a/drydocker/hkccp/build.sh b/drydocker/kolab-hkccp/build.sh
similarity index 100%
rename from drydocker/hkccp/build.sh
rename to drydocker/kolab-hkccp/build.sh
diff --git a/drydocker/hkccp/test_build.sh b/drydocker/kolab-hkccp/test_build.sh
similarity index 100%
rename from drydocker/hkccp/test_build.sh
rename to drydocker/kolab-hkccp/test_build.sh
diff --git a/drydocker/libkolabxml/test_obs.sh b/drydocker/kolab-hkccp/test_obs.sh
similarity index 84%
copy from drydocker/libkolabxml/test_obs.sh
copy to drydocker/kolab-hkccp/test_obs.sh
index bd21164..bb00a8d 100755
--- a/drydocker/libkolabxml/test_obs.sh
+++ b/drydocker/kolab-hkccp/test_obs.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-pushd /srv/libkolabxml.git
+pushd /srv/${PACKAGE}.git
 
 source /srv/stick.git/drydocker/generic_obs.sh
 
 retval=$(_shell obs_build_local)
 
 if [ ${retval} -ne 0 ]; then
     exit ${retval}
 fi
 popd
diff --git a/drydocker/syncroton/build.sh b/drydocker/kolab-syncroton/build.sh
similarity index 100%
rename from drydocker/syncroton/build.sh
rename to drydocker/kolab-syncroton/build.sh
diff --git a/drydocker/syncroton/test_build.sh b/drydocker/kolab-syncroton/test_build.sh
similarity index 100%
rename from drydocker/syncroton/test_build.sh
rename to drydocker/kolab-syncroton/test_build.sh
diff --git a/drydocker/libkolabxml/test_obs.sh b/drydocker/kolab-syncroton/test_obs.sh
similarity index 84%
copy from drydocker/libkolabxml/test_obs.sh
copy to drydocker/kolab-syncroton/test_obs.sh
index bd21164..bb00a8d 100755
--- a/drydocker/libkolabxml/test_obs.sh
+++ b/drydocker/kolab-syncroton/test_obs.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-pushd /srv/libkolabxml.git
+pushd /srv/${PACKAGE}.git
 
 source /srv/stick.git/drydocker/generic_obs.sh
 
 retval=$(_shell obs_build_local)
 
 if [ ${retval} -ne 0 ]; then
     exit ${retval}
 fi
 popd
diff --git a/drydocker/libkolabxml/test_obs.sh b/drydocker/kolab-webadmin/test_obs.sh
similarity index 84%
copy from drydocker/libkolabxml/test_obs.sh
copy to drydocker/kolab-webadmin/test_obs.sh
index bd21164..bb00a8d 100755
--- a/drydocker/libkolabxml/test_obs.sh
+++ b/drydocker/kolab-webadmin/test_obs.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-pushd /srv/libkolabxml.git
+pushd /srv/${PACKAGE}.git
 
 source /srv/stick.git/drydocker/generic_obs.sh
 
 retval=$(_shell obs_build_local)
 
 if [ ${retval} -ne 0 ]; then
     exit ${retval}
 fi
 popd
diff --git a/drydocker/libkolabxml/test_obs.sh b/drydocker/libkolab/test_obs.sh
similarity index 84%
copy from drydocker/libkolabxml/test_obs.sh
copy to drydocker/libkolab/test_obs.sh
index bd21164..bb00a8d 100755
--- a/drydocker/libkolabxml/test_obs.sh
+++ b/drydocker/libkolab/test_obs.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-pushd /srv/libkolabxml.git
+pushd /srv/${PACKAGE}.git
 
 source /srv/stick.git/drydocker/generic_obs.sh
 
 retval=$(_shell obs_build_local)
 
 if [ ${retval} -ne 0 ]; then
     exit ${retval}
 fi
 popd
diff --git a/drydocker/libkolabxml/test_obs.sh b/drydocker/libkolabxml/test_obs.sh
index bd21164..bb00a8d 100755
--- a/drydocker/libkolabxml/test_obs.sh
+++ b/drydocker/libkolabxml/test_obs.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-pushd /srv/libkolabxml.git
+pushd /srv/${PACKAGE}.git
 
 source /srv/stick.git/drydocker/generic_obs.sh
 
 retval=$(_shell obs_build_local)
 
 if [ ${retval} -ne 0 ]; then
     exit ${retval}
 fi
 popd
diff --git a/drydocker/libkolabxml/test_obs.sh b/drydocker/pykolab/test_obs.sh
similarity index 84%
copy from drydocker/libkolabxml/test_obs.sh
copy to drydocker/pykolab/test_obs.sh
index bd21164..bb00a8d 100755
--- a/drydocker/libkolabxml/test_obs.sh
+++ b/drydocker/pykolab/test_obs.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-pushd /srv/libkolabxml.git
+pushd /srv/${PACKAGE}.git
 
 source /srv/stick.git/drydocker/generic_obs.sh
 
 retval=$(_shell obs_build_local)
 
 if [ ${retval} -ne 0 ]; then
     exit ${retval}
 fi
 popd
diff --git a/drydocker/libkolabxml/test_obs.sh b/drydocker/roundcubemail-plugins-kolab/test_obs.sh
similarity index 84%
copy from drydocker/libkolabxml/test_obs.sh
copy to drydocker/roundcubemail-plugins-kolab/test_obs.sh
index bd21164..bb00a8d 100755
--- a/drydocker/libkolabxml/test_obs.sh
+++ b/drydocker/roundcubemail-plugins-kolab/test_obs.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-pushd /srv/libkolabxml.git
+pushd /srv/${PACKAGE}.git
 
 source /srv/stick.git/drydocker/generic_obs.sh
 
 retval=$(_shell obs_build_local)
 
 if [ ${retval} -ne 0 ]; then
     exit ${retval}
 fi
 popd
diff --git a/drydocker/libkolabxml/test_obs.sh b/drydocker/roundcubemail/test_obs.sh
similarity index 84%
copy from drydocker/libkolabxml/test_obs.sh
copy to drydocker/roundcubemail/test_obs.sh
index bd21164..bb00a8d 100755
--- a/drydocker/libkolabxml/test_obs.sh
+++ b/drydocker/roundcubemail/test_obs.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-pushd /srv/libkolabxml.git
+pushd /srv/${PACKAGE}.git
 
 source /srv/stick.git/drydocker/generic_obs.sh
 
 retval=$(_shell obs_build_local)
 
 if [ ${retval} -ne 0 ]; then
     exit ${retval}
 fi
 popd