diff --git a/conf/opsi-builder.cfg b/conf/opsi-builder.cfg
index 1ddbfea..1eda030 100644
--- a/conf/opsi-builder.cfg
+++ b/conf/opsi-builder.cfg
@@ -30,7 +30,6 @@ CREATOR_NAME="Your name"
 CREATOR_EMAIL="your-email@domain.de"
 
 
-
 ##################################
 # OPSI repository settings
 #################################
@@ -38,13 +37,13 @@ CREATOR_EMAIL="your-email@domain.de"
 OPSI_REPOS_BASE_DIR=$HOME/.opsi-repository
 
 # Directory- and filename pattern
-OPSI_REPOS_PRODUCT_DIR=${OPSI_REPOS_BASE_DIR}/${STATUS}/${VENDOR}/${PN}/${VERSION}-${RELEASE}
+OPSI_REPOS_PRODUCT_DIR=${OPSI_REPOS_BASE_DIR}/${STATUS}/${VENDOR}/${PN}/${VERSION}-${CREATOR_TAG}${RELEASE}
 
 # OPSI-package filepattern
 OPSI_REPOS_FILE_PATTERN=${PN}_${VERSION}-${CREATOR_TAG}${RELEASE}
 
 # Force alway upload  to opsi repos
-# OPSI_REPOS_FORCE_UPLOAD=1
+# OPSI_REPOS_FORCE_UPLOAD=true
 
 
 ###############################