diff --git a/hdp-ambari-mpack-3.1.4.0-1/common-services/FLINK/1.9.3/configuration/flink-ambari-config.xml b/hdp-ambari-mpack-3.1.4.0-1/common-services/FLINK/1.9.3/configuration/flink-ambari-config.xml
index e95d4ed..7728b83 100644
--- a/hdp-ambari-mpack-3.1.4.0-1/common-services/FLINK/1.9.3/configuration/flink-ambari-config.xml
+++ b/hdp-ambari-mpack-3.1.4.0-1/common-services/FLINK/1.9.3/configuration/flink-ambari-config.xml
@@ -56,7 +56,7 @@
 
   <property>
     <name>setup_prebuilt</name>
-    <value>false</value>
+    <value>true</value>
     <description>If false, will compile Flink from source instead</description>
   </property>   
   
@@ -69,7 +69,7 @@
 
   <property>
     <name>flink_download_url</name>
-    <value>http://us.mirrors.quenda.co/apache/flink/flink-1.9.3/flink-1.9.3-bin-scala_2.11.tgz</value>
+    <value>https://archive.apache.org/dist/flink/flink-1.9.3/flink-1.9.3-bin-scala_2.11.tgz</value>
     <description>Snapshot download location. Downloaded when setup_prebuilt is true</description>
   </property>
 
diff --git a/hdp-ambari-mpack-3.1.4.0-1/common-services/FLINK/1.9.3/configuration/flink-env.xml b/hdp-ambari-mpack-3.1.4.0-1/common-services/FLINK/1.9.3/configuration/flink-env.xml
index ecd72b6..cb19980 100644
--- a/hdp-ambari-mpack-3.1.4.0-1/common-services/FLINK/1.9.3/configuration/flink-env.xml
+++ b/hdp-ambari-mpack-3.1.4.0-1/common-services/FLINK/1.9.3/configuration/flink-env.xml
@@ -20,6 +20,16 @@
     <value>flink</value>
     <property-type>USER</property-type>
     <description>User flink daemon runs as</description>
+    <value-attributes>
+      <type>user</type>
+      <overridable>false</overridable>
+      <user-groups>
+        <property>
+          <type>cluster-env</type>
+          <name>user_group</name>
+        </property>
+      </user-groups>
+    </value-attributes>
   </property> 
         
   <property>
diff --git a/hdp-ambari-mpack-3.1.4.0/common-services/FLINK/1.9.3/configuration/flink-ambari-config.xml b/hdp-ambari-mpack-3.1.4.0/common-services/FLINK/1.9.3/configuration/flink-ambari-config.xml
index e95d4ed..7728b83 100644
--- a/hdp-ambari-mpack-3.1.4.0/common-services/FLINK/1.9.3/configuration/flink-ambari-config.xml
+++ b/hdp-ambari-mpack-3.1.4.0/common-services/FLINK/1.9.3/configuration/flink-ambari-config.xml
@@ -56,7 +56,7 @@
 
   <property>
     <name>setup_prebuilt</name>
-    <value>false</value>
+    <value>true</value>
     <description>If false, will compile Flink from source instead</description>
   </property>   
   
@@ -69,7 +69,7 @@
 
   <property>
     <name>flink_download_url</name>
-    <value>http://us.mirrors.quenda.co/apache/flink/flink-1.9.3/flink-1.9.3-bin-scala_2.11.tgz</value>
+    <value>https://archive.apache.org/dist/flink/flink-1.9.3/flink-1.9.3-bin-scala_2.11.tgz</value>
     <description>Snapshot download location. Downloaded when setup_prebuilt is true</description>
   </property>
 
diff --git a/hdp-ambari-mpack-3.1.4.0/common-services/FLINK/1.9.3/configuration/flink-env.xml b/hdp-ambari-mpack-3.1.4.0/common-services/FLINK/1.9.3/configuration/flink-env.xml
index ecd72b6..bd3a318 100644
--- a/hdp-ambari-mpack-3.1.4.0/common-services/FLINK/1.9.3/configuration/flink-env.xml
+++ b/hdp-ambari-mpack-3.1.4.0/common-services/FLINK/1.9.3/configuration/flink-env.xml
@@ -20,7 +20,17 @@
     <value>flink</value>
     <property-type>USER</property-type>
     <description>User flink daemon runs as</description>
-  </property> 
+    <value-attributes>
+      <type>user</type>
+      <overridable>false</overridable>
+      <user-groups>
+        <property>
+          <type>cluster-env</type>
+          <name>user_group</name>
+        </property>
+      </user-groups>
+    </value-attributes>
+  </property>
         
   <property>
     <name>flink_group</name>