diff --git a/flink/flink1.10-shims/pom.xml b/flink/flink1.10-shims/pom.xml
index 8a60436e242..b1a448e4d54 100644
--- a/flink/flink1.10-shims/pom.xml
+++ b/flink/flink1.10-shims/pom.xml
@@ -33,7 +33,7 @@
     <name>Zeppelin: Flink1.10 Shims</name>
 
     <properties>
-        <flink.version>1.10.0</flink.version>
+        <flink.version>${flink1.10.version}</flink.version>
         <scala.binary.version>2.11</scala.binary.version>
         <scala.version>2.11.12</scala.version>
     </properties>
diff --git a/flink/flink1.11-shims/pom.xml b/flink/flink1.11-shims/pom.xml
index 458e560e704..43260ec044b 100644
--- a/flink/flink1.11-shims/pom.xml
+++ b/flink/flink1.11-shims/pom.xml
@@ -33,7 +33,7 @@
     <name>Zeppelin: Flink1.11 Shims</name>
 
     <properties>
-        <flink.version>1.11-SNAPSHOT</flink.version>
+        <flink.version>${flink1.11.version}</flink.version>
         <scala.binary.version>2.11</scala.binary.version>
         <scala.version>2.11.12</scala.version>
     </properties>
diff --git a/flink/interpreter/pom.xml b/flink/interpreter/pom.xml
index bb991a391c8..bc6704a70f6 100644
--- a/flink/interpreter/pom.xml
+++ b/flink/interpreter/pom.xml
@@ -37,8 +37,7 @@
   <properties>
     <!--library versions-->
     <interpreter.name>flink</interpreter.name>
-<!--    <flink.version>1.11-SNAPSHOT</flink.version>-->
-    <flink.version>1.10.0</flink.version>
+    <flink.version>${flink1.10.version}</flink.version>
     <flink.hadoop.version>2.6.5</flink.hadoop.version>
     <hive.version>2.3.4</hive.version>
     <hiverunner.version>4.0.0</hiverunner.version>
@@ -876,14 +875,14 @@
     <profile>
       <id>flink-1.10</id>
       <properties>
-        <flink.version>1.10.0</flink.version>
+        <flink.version>${flink1.10.version}</flink.version>
       </properties>
     </profile>
 
     <profile>
       <id>flink-1.11</id>
       <properties>
-        <flink.version>1.11-SNAPSHOT</flink.version>
+        <flink.version>${flink1.11.version}</flink.version>
       </properties>
     </profile>
 
diff --git a/flink/interpreter/src/main/scala/org/apache/zeppelin/flink/FlinkScalaInterpreter.scala b/flink/interpreter/src/main/scala/org/apache/zeppelin/flink/FlinkScalaInterpreter.scala
index aaedc826dfc..3d125972eb9 100644
--- a/flink/interpreter/src/main/scala/org/apache/zeppelin/flink/FlinkScalaInterpreter.scala
+++ b/flink/interpreter/src/main/scala/org/apache/zeppelin/flink/FlinkScalaInterpreter.scala
@@ -47,6 +47,7 @@ import org.apache.flink.table.functions.{AggregateFunction, ScalarFunction, Tabl
 import org.apache.flink.table.module.ModuleManager
 import org.apache.flink.table.module.hive.HiveModule
 import org.apache.flink.yarn.cli.FlinkYarnSessionCli
+import org.apache.flink.yarn.executors.YarnSessionClusterExecutor
 import org.apache.zeppelin.flink.util.DependencyUtils
 import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion
 import org.apache.zeppelin.interpreter.util.InterpreterOutputStream
@@ -223,6 +224,10 @@ class FlinkScalaInterpreter(val properties: Properties) {
         .copy(port = Some(Integer.parseInt(port)))
     }
 
+    if (config.executionMode == ExecutionMode.YARN) {
+      // workaround for FLINK-17788, otherwise it won't work with flink 1.10.1 which has been released.
+      configuration.set(DeploymentOptions.TARGET, YarnSessionClusterExecutor.NAME)
+    }
     config
   }
 
diff --git a/flink/pom.xml b/flink/pom.xml
index e197e22700b..d15e748d951 100644
--- a/flink/pom.xml
+++ b/flink/pom.xml
@@ -41,6 +41,11 @@
         <module>flink1.11-shims</module>
     </modules>
 
+    <properties>
+        <flink1.10.version>1.10.1</flink1.10.version>
+        <flink1.11.version>1.11-SNAPSHOT</flink1.11.version>
+    </properties>
+
     <dependencies>
 
         <dependency>