diff --git a/environment/local.ccm.properties b/environment/local.ccm.properties
new file mode 100644
index 000000000..d4a22189c
--- /dev/null
+++ b/environment/local.ccm.properties
@@ -0,0 +1,136 @@
+## For local modifications of the ccm build details overwrite
+## the appropriate properties
+## The defaults are shown commented out
+
+## Usually you will define your own specific bundle!
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/complete
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/devel
+#
+#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/handbook
+#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/staatsschiff
+#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/nsh
+#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/zsr
+#
+#ccm.bundle.folder=${ccm.project.dir}/ccm-aap-aplaws/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-iaw-aplaws/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ifs-aplaws/bundles/devel
+ccm.bundle.folder=${ccm.project.dir}/ccm-zes-aplaws/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-zes-aplaws/bundles/standard
+
+
+#ccm.bundle.folder=${ccm.project.dir}/ccm-shp-aplaws/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-shp-aplaws/bundles/openccm-devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-shp-aplaws/bundles/lsb
+
+# ---------------------------------------------------------------------
+# Update von rel. 1.1.0 auf 1.1.1 mit Erweiterungen sci -- SPIN 2
+# Müssen NACH dem (regulären) Update 1.1.0 -> 1.1.1 durchgeführt werden
+# ---------------------------------------------------------------------
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-cms-types-simpleaddress
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-forum
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-themedirector
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-portalworkspace
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# -----------------------------------------------------
+# Update von rel. 1.1.0 auf 1.1.1 mit Erweiterungen sci
+# -----------------------------------------------------
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-cms-assets-imagestep
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-cms-assets-notes
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-ldn-navigation
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-ldn-terms
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-cms
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-cms-types-article
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-cms-types-newsitem
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-cms-types-event
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-core
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+
+# -----------------------------------------------------
+# Update von (intern) rel. 1.0.5 auf 1.1.0 
+# ----------------------------------------------------
+# Nur ZeS:
+# ccm.upgrade.package=ccm-core
+# ccm.upgrade.from.version=6.5.2
+# ccm.upgrade.to.version=6.5.3
+
+# Nur ZeS:
+# ccm.upgrade.package=ccm-core
+# ccm.upgrade.from.version=6.5.5
+# ccm.upgrade.to.version=6.5.6
+
+# ccm.barkhof und zes
+# ccm.upgrade.package=ccm-cms
+# ccm.upgrade.from.version=6.5.3
+# ccm.upgrade.to.version=6.5.4
+
+# ccm.barkhof und zes
+# ccm.upgrade.package=ccm-ldn-portal
+# ccm.upgrade.from.version=6.5.1
+# ccm.upgrade.to.version=6.5.2
+
+# ccm.barkhof und zes
+# ccm.upgrade.package=ccm-ldn-portal
+# ccm.upgrade.from.version=6.5.2
+# ccm.upgrade.to.version=6.5.3
+
+# ccm.barkhof und zes
+# ccm.upgrade.package=ccm-ldn-terms
+# ccm.upgrade.from.version=6.5.0
+# ccm.upgrade.to.version=6.5.1
+
+# ccm.barkhof und zes
+# ccm.upgrade.package=ccm-ldn-terms
+# ccm.upgrade.from.version=6.5.1
+# ccm.upgrade.to.version=6.5.2
+
diff --git a/environment/project.xml.gen-dev b/environment/project.xml.gen-dev
index 8a9054e1a..118c91ed8 100644
--- a/environment/project.xml.gen-dev
+++ b/environment/project.xml.gen-dev
@@ -23,11 +23,10 @@
 <!--   Main apps   -->
 <!--   - - - - -   -->
         <ccm:application name="ccm-core"/>
-
         <ccm:application name="ccm-cms"/>
 
         <ccm:application name="ccm-cms-assets-fileattachment"/>
-        <ccm:application name="ccm-cms-assets-imagestep"/>
+<!--    <ccm:application name="ccm-cms-assets-imagestep"/>           -->
         <ccm:application name="ccm-cms-assets-notes"/>
         <ccm:application name="ccm-cms-assets-relatedlink"/>
 
@@ -65,11 +64,11 @@
 <!--    <ccm:application name="ccm-bookmarks"/>                      -->
 <!--    temporarily excluded, produces errors in the build process
         <ccm:application name="ccm-docmngr"/>                        -->
-
 <!--    <ccm:application name="ccm-formbuilder-pdf"/>                -->
         <ccm:application name="ccm-forum"/>
-        <ccm:application name="ccm-forum-categorised"/>
+<!--    <ccm:application name="ccm-forum-categorised"/>              -->
 <!--    <ccm:application name="ccm-simplesurvey"/>                   -->
+<!--    <ccm:application name="ccm-themedirector"/>                  -->
         <ccm:application name="ccm-user-preferences"/>
 <!--    <ccm:application name="ccm-weblog"/>                         -->
 <!--    <ccm:application name="ccm-webpage"/>                        -->
@@ -82,14 +81,13 @@
 <!--    <ccm:application name="ccm-ldn-exporter"/>                   -->
 <!--    <ccm:application name="ccm-ldn-freeform"/>                   -->
 <!--    <ccm:application name="ccm-ldn-importer"/>                   -->
-        <ccm:application name="ccm-ldn-navigation"/>
+<!--    <ccm:application name="ccm-ldn-navigation"/>                 -->
         <ccm:application name="ccm-ldn-portal"/>
-        <ccm:application name="ccm-ldn-rss"/>                        
+<!--    <ccm:application name="ccm-ldn-rss"/>                        -->
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
-        <ccm:application name="ccm-ldn-subsite"/>                    
+        <ccm:application name="ccm-ldn-subsite"/> 
         <ccm:application name="ccm-ldn-terms"/>
-        <ccm:application name="ccm-ldn-theme"/>
         <ccm:application name="ccm-ldn-util"/>
 
 
diff --git a/environment/project.xml.zes b/environment/project.xml.zes
index fab84684b..109b7ac21 100644
--- a/environment/project.xml.zes
+++ b/environment/project.xml.zes
@@ -64,6 +64,7 @@
 <!--    <ccm:application name="ccm-docmngr"/>                        -->
 <!--    <ccm:application name="ccm-formbuilder-pdf"/>                -->
         <ccm:application name="ccm-forum"/>
+        <ccm:application name="ccm-portalworkspace"/>
         <ccm:application name="ccm-simplesurvey"/>
         <ccm:application name="ccm-themedirector"/>
         <ccm:application name="ccm-user-preferences"/>
@@ -79,7 +80,6 @@
 <!--    <ccm:application name="ccm-ldn-freeform"/>                   -->
 <!--    <ccm:application name="ccm-ldn-importer"/>                   -->
         <ccm:application name="ccm-ldn-navigation"/>
-        <ccm:application name="ccm-ldn-portal"/>
         <ccm:application name="ccm-ldn-rss"/>                        
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>