diff --git a/flink-shaded-swagger/pom.xml b/flink-shaded-swagger/pom.xml
index cb6d9b7..13d3b63 100644
--- a/flink-shaded-swagger/pom.xml
+++ b/flink-shaded-swagger/pom.xml
@@ -37,6 +37,7 @@ under the License.
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-core</artifactId>
             <version>2.2.19</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -52,6 +53,7 @@ under the License.
                 <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
                 <version>2.1</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml
index 6b377b9..f3df990 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml
@@ -41,6 +41,7 @@ under the License.
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- Flink distribution provides logging classes -->
@@ -63,6 +64,7 @@ under the License.
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
             <version>${curator.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- not relevant at runtime -->
@@ -114,6 +116,7 @@ under the License.
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
                 <version>${zookeeper.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
@@ -127,6 +130,7 @@ under the License.
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml
index 1e073d9..2433959 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml
@@ -41,6 +41,7 @@ under the License.
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- Flink distribution provides logging classes -->
@@ -71,6 +72,7 @@ under the License.
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
             <version>3.2.5</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- Flink distribution provides logging classes -->
@@ -88,6 +90,7 @@ under the License.
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
             <version>${curator.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- not relevant at runtime -->
@@ -139,6 +142,7 @@ under the License.
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
                 <version>${zookeeper.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
@@ -152,6 +156,7 @@ under the License.
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml
index 9d3fda0..5ef1e8e 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml
@@ -41,6 +41,7 @@ under the License.
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- not relevant at runtime -->
@@ -61,6 +62,7 @@ under the License.
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
             <version>4.1.12.1</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- Flink distribution provides logging classes -->
@@ -73,6 +75,7 @@ under the License.
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
             <version>${curator.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- not relevant at runtime -->
@@ -124,6 +127,7 @@ under the License.
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
                 <version>${zookeeper.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
@@ -137,6 +141,7 @@ under the License.
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml
index 9935f81..80f38cf 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml
@@ -41,6 +41,7 @@ under the License.
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- not relevant at runtime -->
@@ -65,6 +66,7 @@ under the License.
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
             <version>4.1.12.1</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- Flink distribution provides logging classes -->
@@ -77,6 +79,7 @@ under the License.
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
             <version>${curator.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- not relevant at runtime -->
@@ -128,6 +131,7 @@ under the License.
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
                 <version>${zookeeper.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
@@ -141,6 +145,7 @@ under the License.
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
         </dependencies>
     </dependencyManagement>