diff --git a/atlas-ui/Dockerfile b/atlas-ui/Dockerfile
index 33fc0e3..a4d0667 100644
--- a/atlas-ui/Dockerfile
+++ b/atlas-ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.17.1
+FROM nginx:1.21.1
 MAINTAINER vitaly.koulakov@odysseusinc.com
 
 RUN apt-get -q update && DEBIAN_FRONTEND=noninteractive apt-get -yq install unzip
@@ -6,4 +6,4 @@ RUN apt-get -q update && DEBIAN_FRONTEND=noninteractive apt-get -yq install unzi
 COPY target/atlasui.zip atlasui.zip
 RUN rm -f /usr/share/nginx/html/index.html \
     && unzip -qq atlasui.zip -d /usr/share/nginx/html && rm -f atlasui.zip
-COPY config-local.js /usr/share/nginx/html/js
\ No newline at end of file
+COPY config-local.js /usr/share/nginx/html/js
diff --git a/atlas-ui/pom.xml b/atlas-ui/pom.xml
index 9058008..b011d41 100644
--- a/atlas-ui/pom.xml
+++ b/atlas-ui/pom.xml
@@ -9,7 +9,7 @@
     <version>2.7.3-SNAPSHOT</version>
 
     <properties>
-        <frontendBranch>bcbssc</frontendBranch>
+        <frontendBranch>issue-1168-hive-adding-support</frontendBranch>
         <dockerfile.version>1.4.10</dockerfile.version>
     </properties>
 
@@ -147,4 +147,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/execution-engine/Dockerfile b/execution-engine/Dockerfile
index 073c2e1..637249d 100644
--- a/execution-engine/Dockerfile
+++ b/execution-engine/Dockerfile
@@ -1,4 +1,4 @@
-FROM odysseusinc/r-env:1.0.7
+FROM odysseusinc/r-env:1.0.12
 MAINTAINER vitaly.koulakov@odysseusinc.com
 
 RUN mkdir /usr/share/execution-engine && mkdir /netezza
@@ -6,5 +6,8 @@ ARG JAR_FILE
 ADD target/${JAR_FILE} /usr/share/execution-engine/execution-engine.jar
 ARG NETEZZA_JDBC
 ADD ${NETEZZA_JDBC} /netezza/nzjdbc.jar
+ARG HIVE_JDBC
+# hive-jdbc-standalone contains all necessary dependencies inside it for running queries through hive such as hive-jdbc, hive-common, libthrift, zookeeper, etc.
+COPY ${HIVE_JDBC}/hive-jdbc-standalone.jar /hive/hive-jdbc-standalone.jar
 
 ENTRYPOINT ["java", "-jar", "/usr/share/execution-engine/execution-engine.jar"]
\ No newline at end of file
diff --git a/execution-engine/pom.xml b/execution-engine/pom.xml
index 23629e4..6f6f576 100644
--- a/execution-engine/pom.xml
+++ b/execution-engine/pom.xml
@@ -15,8 +15,9 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <arachne.version>1.15.0-SNAPSHOT</arachne.version>
+        <arachne.version>1.16.0-SNAPSHOT</arachne.version>
         <netezza.driver.path>src/drivers/README.md</netezza.driver.path>
+        <hive.driver.path>src/drivers/hive</hive.driver.path>
     </properties>
 
     <dependencyManagement>
@@ -388,6 +389,22 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>hive</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hive</groupId>
+                    <artifactId>hive-jdbc</artifactId>
+                    <version>3.1.0</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.eclipse.jetty</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 
     <build>
@@ -415,6 +432,7 @@
                     <buildArgs>
                         <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
                         <NETEZZA_JDBC>${netezza.driver.path}</NETEZZA_JDBC>
+                        <HIVE_JDBC>${hive.driver.path}</HIVE_JDBC>
                     </buildArgs>
                     <skip>${dockerfile.skip}</skip>
                 </configuration>
diff --git a/execution-engine/src/drivers/README.md b/execution-engine/src/drivers/README.md
index 060e032..bb6c6d0 100644
--- a/execution-engine/src/drivers/README.md
+++ b/execution-engine/src/drivers/README.md
@@ -3,4 +3,11 @@ with -Dnetezza.driver.path, e.g.
 
 ```bash
 mvn -Dnetezza.driver.path=src/drivers/nzjdbc.jar clean package
-```
\ No newline at end of file
+```
+
+To include Hive driver download it, place here and point to it 
+with -Dhive.driver.path, e.g.
+
+```bash
+mvn -Dhive.driver.path=src/drivers/hive-jdbc-standalone.jar clean package
+``` 
\ No newline at end of file
diff --git a/execution-engine/src/main/java/com/odysseusinc/arachne/executionenginecloud/Application.java b/execution-engine/src/main/java/com/odysseusinc/arachne/executionenginecloud/Application.java
index 9c09b9c..b8e9662 100644
--- a/execution-engine/src/main/java/com/odysseusinc/arachne/executionenginecloud/Application.java
+++ b/execution-engine/src/main/java/com/odysseusinc/arachne/executionenginecloud/Application.java
@@ -13,10 +13,10 @@
         }
 )
 /**
- * Note: When using default profile it's required to externalize properties needed to be overriden defaults
+ * Note: When using default profile it's required to externalize properties needed to be overridden defaults
  *  inherited from execution-engine dependency. At least <b>server.port</b> and <b>server.ssl.enabled</b>
- *  should be overriden directly by command line arguments or with additional config location.
- *  This is beacause spring determines properties loading order and external properties has prevalence over
+ *  should be overridden directly by command line arguments or with additional config location.
+ *  This is because spring determines properties loading order and external properties has prevalence over
  *  default application properties.
  *  Not a problem when running in docker container since docker externalize properties with environment variables.
  */
diff --git a/pom.xml b/pom.xml
index 98b5d72..627bcb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <module>execution-engine</module>
         <module>proxy-svr</module>
         <module>service-discovery-svr</module>
-        <module>webapi</module>
+        <!--module>webapi</module-->
         <module>atlas-ui</module>
     </modules>
 
@@ -40,4 +40,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/webapi/Dockerfile b/webapi/Dockerfile
index 204fc09..79d61cf 100644
--- a/webapi/Dockerfile
+++ b/webapi/Dockerfile
@@ -1,4 +1,4 @@
-FROM odysseusinc/r-env:1.0.7
+FROM odysseusinc/r-env:1.0.12
 MAINTAINER vitaly.koulakov@odysseusinc.com
 
 RUN mkdir /usr/share/webapi
diff --git a/webapi/pom.xml b/webapi/pom.xml
index 6de1c56..3e2c683 100644
--- a/webapi/pom.xml
+++ b/webapi/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.ohdsi</groupId>
             <artifactId>WebAPI</artifactId>
-            <version>2.7.3</version>
+            <version>2.7.3-SNAPSHOT</version>
             <classifier>classes</classifier>
         </dependency>
         <dependency>
@@ -158,5 +158,23 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>webapi-hive</id>
+            <dependencies>
+                <dependency>
+<!--        it's not possible to use hive-jdbc-standalone.jar in conjunction with spring-boot-maven-plugin because currently Spring Boot doesn't support Zip64 archives
+            (see comments here: https://github.com/spring-projects/spring-boot/issues/9861) so we use org.apache.hive:hive-jdbc:3.1.0  -->
+                    <groupId>org.apache.hive</groupId>
+                    <artifactId>hive-jdbc</artifactId>
+                    <version>3.1.0</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.eclipse.jetty</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>
\ No newline at end of file