diff --git a/ci/deploy_snapshots.js b/ci/deploy_snapshots.js
index 6c5dc9ea7e..3225b579d6 100644
--- a/ci/deploy_snapshots.js
+++ b/ci/deploy_snapshots.js
@@ -27,7 +27,7 @@ if (gitTag != "@deploy-snapshot") {
 try {
     tools.stage("DEPLOY SNAPSHOTS");
     tools.prepareGPGKey();
-    tools.sh("mvn deploy -B -s ci/settings.xml -Prelease -Padobe-public");
+    tools.sh("mvn deploy -B -s ci/settings.xml -Prelease -Padobe-public -Pcloud");
     tools.stage("DEPLOY SNAPSHOTS DONE");
 } finally {
     tools.removeGitTag(gitTag);
diff --git a/ci/release.js b/ci/release.js
index a44cdbf092..d1768593fb 100644
--- a/ci/release.js
+++ b/ci/release.js
@@ -41,7 +41,7 @@ tools.gitImpersonate('CircleCi', 'noreply@circleci.com', () => {
         console.log("Checking out the master branch so we can commit and push");
         tools.sh("git checkout master");
         tools.prepareGPGKey();
-        tools.sh("mvn -B -s ci/settings.xml -Prelease,adobe-public clean release:prepare release:perform" + releaseVersion);
+        tools.sh("mvn -B -s ci/settings.xml -Prelease,adobe-public,cloud clean release:prepare release:perform" + releaseVersion);
         tools.stage("RELEASE DONE");
     } finally {
         tools.removeGitTag(gitTag);
diff --git a/config/src/content/META-INF/vault/filter.xml b/config/src/content/META-INF/vault/filter.xml
index 5e6df95bef..0bd28b4182 100644
--- a/config/src/content/META-INF/vault/filter.xml
+++ b/config/src/content/META-INF/vault/filter.xml
@@ -17,4 +17,4 @@
 <workspaceFilter version="1.0">
     <filter root="/apps/core/wcm/config"/>
     <filter root="/apps/core/wcm/config.author"/>
-</workspaceFilter>
+</workspaceFilter>
\ No newline at end of file
diff --git a/content/pom.xml b/content/pom.xml
index 712f5d08d0..28ef310235 100644
--- a/content/pom.xml
+++ b/content/pom.xml
@@ -57,6 +57,11 @@
                 <artifactId>filevault-package-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <filters>
+                        <filter>
+                            <root>/apps/core/wcm/components</root>
+                        </filter>
+                    </filters>
                     <packageType>application</packageType>
                     <dependencies>
                         <dependency>
@@ -203,6 +208,68 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>cloud</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>copy-resources</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/jcr_root/libs</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${basedir}/src/content/jcr_root/apps</directory>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.jackrabbit</groupId>
+                        <artifactId>filevault-package-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>generate-metadata-cloud</id>
+                                <goals>
+                                    <goal>generate-metadata</goal>
+                                </goals>
+                                <configuration>
+                                    <filters>
+                                        <filter>
+                                            <root>/libs/core/wcm/components</root>
+                                        </filter>
+                                    </filters>
+                                    <classifier>cloud</classifier>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>package-cloud</id>
+                                <goals>
+                                    <goal>package</goal>
+                                </goals>
+                                <configuration>
+                                    <jcrRootSourceDirectory>${project.build.directory}/jcr_root</jcrRootSourceDirectory>
+                                    <classifier>cloud</classifier>
+                                    <workDirectory>${project.build.directory}/vault-work-cloud</workDirectory>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <!-- ====================================================================== -->
diff --git a/content/src/content/META-INF/vault/filter.xml b/content/src/content/META-INF/vault/filter.xml
deleted file mode 100644
index 54659787f8..0000000000
--- a/content/src/content/META-INF/vault/filter.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2016 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<workspaceFilter version="1.0">
-    <filter root="/apps/core/wcm/components"/>
-</workspaceFilter>
diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml
index c127775ee0..255db71ecb 100644
--- a/examples/ui.content/pom.xml
+++ b/examples/ui.content/pom.xml
@@ -60,6 +60,11 @@
                     <properties>
                         <acHandling>merge_preserve</acHandling>
                     </properties>
+                    <validatorsSettings>
+                        <jackrabbit-nodetypes>
+                            <isDisabled>true</isDisabled>
+                        </jackrabbit-nodetypes>
+                    </validatorsSettings>
                     <dependencies>
                         <dependency>
                             <groupId>com.adobe.cq</groupId>
diff --git a/extensions/amp/content/package-lock.json b/extensions/amp/content/package-lock.json
index 17ff8d4665..ee72e58f8e 100644
--- a/extensions/amp/content/package-lock.json
+++ b/extensions/amp/content/package-lock.json
@@ -2766,8 +2766,7 @@
                 "ansi-regex": {
                     "version": "2.1.1",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "aproba": {
                     "version": "1.2.0",
@@ -2788,14 +2787,12 @@
                 "balanced-match": {
                     "version": "1.0.0",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "brace-expansion": {
                     "version": "1.1.11",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "balanced-match": "^1.0.0",
                         "concat-map": "0.0.1"
@@ -2810,20 +2807,17 @@
                 "code-point-at": {
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "concat-map": {
                     "version": "0.0.1",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "console-control-strings": {
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "core-util-is": {
                     "version": "1.0.2",
@@ -2940,8 +2934,7 @@
                 "inherits": {
                     "version": "2.0.3",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "ini": {
                     "version": "1.3.5",
@@ -2953,7 +2946,6 @@
                     "version": "1.0.0",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "number-is-nan": "^1.0.0"
                     }
@@ -2968,7 +2960,6 @@
                     "version": "3.0.4",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "brace-expansion": "^1.1.7"
                     }
@@ -2976,14 +2967,12 @@
                 "minimist": {
                     "version": "0.0.8",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "minipass": {
                     "version": "2.3.5",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "safe-buffer": "^5.1.2",
                         "yallist": "^3.0.0"
@@ -3002,7 +2991,6 @@
                     "version": "0.5.1",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "minimist": "0.0.8"
                     }
@@ -3083,8 +3071,7 @@
                 "number-is-nan": {
                     "version": "1.0.1",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "object-assign": {
                     "version": "4.1.1",
@@ -3096,7 +3083,6 @@
                     "version": "1.4.0",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "wrappy": "1"
                     }
@@ -3182,8 +3168,7 @@
                 "safe-buffer": {
                     "version": "5.1.2",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "safer-buffer": {
                     "version": "2.1.2",
@@ -3219,7 +3204,6 @@
                     "version": "1.0.2",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "code-point-at": "^1.0.0",
                         "is-fullwidth-code-point": "^1.0.0",
@@ -3239,7 +3223,6 @@
                     "version": "3.0.1",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
                     }
@@ -3283,14 +3266,12 @@
                 "wrappy": {
                     "version": "1.0.2",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "yallist": {
                     "version": "3.0.3",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 }
             }
         },
diff --git a/extensions/amp/content/pom.xml b/extensions/amp/content/pom.xml
index 4b768420ee..692fd7f777 100644
--- a/extensions/amp/content/pom.xml
+++ b/extensions/amp/content/pom.xml
@@ -66,6 +66,11 @@
                             <version>[${project.version},)</version>
                         </dependency>
                     </dependencies>
+                    <filters>
+                        <filter>
+                            <root>/apps/core/wcm/extensions</root>
+                        </filter>
+                    </filters>
                 </configuration>
             </plugin>
             <plugin>
@@ -204,6 +209,68 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>cloud</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>copy-resources</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/jcr_root/libs</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${basedir}/src/content/jcr_root/apps</directory>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.jackrabbit</groupId>
+                        <artifactId>filevault-package-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>generate-metadata-cloud</id>
+                                <goals>
+                                    <goal>generate-metadata</goal>
+                                </goals>
+                                <configuration>
+                                    <filters>
+                                        <filter>
+                                            <root>/libs/core/wcm/extensions</root>
+                                        </filter>
+                                    </filters>
+                                    <classifier>cloud</classifier>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>package-cloud</id>
+                                <goals>
+                                    <goal>package</goal>
+                                </goals>
+                                <configuration>
+                                    <jcrRootSourceDirectory>${project.build.directory}/jcr_root</jcrRootSourceDirectory>
+                                    <classifier>cloud</classifier>
+                                    <workDirectory>${project.build.directory}/vault-work-cloud</workDirectory>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <!-- ====================================================================== -->
diff --git a/extensions/amp/content/src/content/META-INF/vault/filter.xml b/extensions/amp/content/src/content/META-INF/vault/filter.xml
deleted file mode 100644
index e5e04e80c2..0000000000
--- a/extensions/amp/content/src/content/META-INF/vault/filter.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2016 Adobe
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<workspaceFilter version="1.0">
-    <filter root="/apps/core/wcm/extensions"/>
-</workspaceFilter>
diff --git a/parent/pom.xml b/parent/pom.xml
index fc3938cad6..0a48500163 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -194,7 +194,7 @@
                 <plugin>
                     <groupId>org.apache.jackrabbit</groupId>
                     <artifactId>filevault-package-maven-plugin</artifactId>
-                    <version>1.1.2</version>
+                    <version>1.1.4</version>
                     <configuration>
                         <failOnMissingEmbed>true</failOnMissingEmbed>
                         <filterSource>${project.basedir}/src/content/META-INF/vault/filter.xml</filterSource>
@@ -221,11 +221,10 @@
                         <validatorsSettings>
                             <jackrabbit-filter>
                                 <options>
-                                    <validRoots>/,/libs,/apps,/apps/core/wcm,/etc,/var,/tmp,/content</validRoots>
+                                    <validRoots>/,/libs,/libs/core/wcm,/apps,/apps/core/wcm,/etc,/var,/tmp,/content</validRoots>
                                 </options>
                             </jackrabbit-filter>
                             <netcentric-aem-classification>
-                                <!-- <disabled>true</disabled>  -->
                                 <defaultSeverity>WARN</defaultSeverity>
                                 <options>
                                     <severitiesPerClassification>INTERNAL_DEPRECATED=WARN</severitiesPerClassification>
diff --git a/testing/it/ui-js/pom.xml b/testing/it/ui-js/pom.xml
index ea51ad6623..b77aa35903 100644
--- a/testing/it/ui-js/pom.xml
+++ b/testing/it/ui-js/pom.xml
@@ -14,7 +14,8 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -90,6 +91,18 @@
                 <extensions>true</extensions>
                 <configuration>
                     <packageType>mixed</packageType>
+                    <validatorsSettings>
+                        <jackrabbit-filter>
+                            <options>
+                                <validRoots>
+                                    /conf,/content,/content/campaigns,/content/dam,/content/cq:tags,/home/users,/etc/blueprints,/apps,/apps/core/wcm
+                                </validRoots>
+                            </options>
+                        </jackrabbit-filter>
+                        <jackrabbit-nodetypes>
+                            <isDisabled>true</isDisabled>
+                        </jackrabbit-nodetypes>
+                    </validatorsSettings>
                     <properties>
                         <acHandling>merge_preserve</acHandling>
                     </properties>