diff --git a/builder-product.cfg b/builder-product.cfg
index 11e068e..e604619 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -14,20 +14,21 @@ TYPE="restrict"
 # File object array
 #####################
 
-FILE[0]="SoftMaker-Logo.png_medium.png"
-SOURCE[0]="http://www.android-user.de/var/ezflow_site/storage/images/artikel/exklusiv-vorschau-auf-softmaker-office-fuer-android/softmaker-logo.png/25888-1-ger-DE/SoftMaker-Logo.png_medium.png"
 
-FILE[1]="TextMakerViewer2010.msi"
-SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/TextMakerViewer2010.msi"
-ARCH[1]="X86"
-WINST[1]="InstallMsi"
+DL_FILE[0]="SoftMaker-Logo.png_medium.png"
+DL_SOURCE[0]="http://www.android-user.de/var/ezflow_site/storage/images/artikel/exklusiv-vorschau-auf-softmaker-office-fuer-android/softmaker-logo.png/25888-1-ger-DE/SoftMaker-Logo.png_medium.png"
+
+DL_FILE[1]="TextMakerViewer2010.msi"
+DL_SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/TextMakerViewer2010.msi"
+DL_ARCH[1]="X86"
+DL_WINST_NAME[1]="InstallMsi"
 
 # Download direct the executable
-#FILE[1]="TMViewerSetup.exe"
-#SOURCE[1]="http://www.softmaker.net/down/TMViewerSetup.exe"
-#ARCH[1]="X86"
-#WINST[1]="InstallExe"
+#DL_FILE[1]="TMViewerSetup.exe"
+#DL_SOURCE[1]="http://www.softmaker.net/down/TMViewerSetup.exe"
+#DL_ARCH[1]="X86"
+#DL_WINST_NAME[1]="InstallExe"
 
 # File array index for the image showing while installing the program
-ICON_FILE_INDEX=0
+ICON_DL_INDEX=0
 
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 639eff1..a7a2987 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -52,9 +52,13 @@ function publish() {
 
 function commit() {
     echo "Commit"
-    # builder_commit
+     builder_commit
 }
 function cleanup() {
-    echo "Cleanup: output_dir: $output_dir"
-    # builder_cleanup
+    echo "Cleanup: output_dir: $OUTPUT_DIR"
+#    cp -a ${OUTPUT_DIR}/${OPSI_REPOS_FILE_PATTERN}.opsi /tmp/tmviewer.opsi
+#    chmod 666 /tmp/tmviewer.opsi
+#    ls -altr /tmp/tmviewer.opsi
+
+     builder_cleanup
 }