diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index ef9bdf2..1987991 100644
--- a/Dockerfile.voltha-onos
+++ b/Dockerfile.voltha-onos
@@ -66,6 +66,7 @@
 ENV KARAF_ROOT=${ONOS}/apache-karaf-${KARAF_VERSION}
 ENV KARAF_M2=${KARAF_ROOT}/system
 ENV APPS_ROOT=${ONOS}/apps
+ENV JAVA_OPTS='-XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:-UseContainerSupport -Dkaraf.log.console=INFO -Dds.lock.timeout.milliseconds=10000'
 
 COPY --from=install ${KARAF_M2}/ ${KARAF_M2}/
 RUN echo "${KARAF_M2} ${APPS_ROOT}"
diff --git a/dependencies.xml b/dependencies.xml
index b3cace7..69fc48f 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -26,12 +26,11 @@
     <properties>
         <olt.version>4.3.0-SNAPSHOT</olt.version>
         <sadis.version>5.1.0</sadis.version>
-        <aaa.version>2.1.0</aaa.version>
+        <aaa.version>2.2.0-SNAPSHOT</aaa.version>
         <dhcpl2relay.version>2.3.0-SNAPSHOT</dhcpl2relay.version>
         <kafka.version>2.4.0</kafka.version>
         <igmpproxy.version>2.1.2</igmpproxy.version>
         <mcast.version>2.1.0</mcast.version>
-        <maclearner.version>1.0.0</maclearner.version>
     </properties>
 
     <build>
@@ -91,13 +90,6 @@
                             <type>oar</type>
                             <overWrite>true</overWrite>
                         </artifactItem>
-                        <artifactItem>
-                            <groupId>org.opencord</groupId>
-                            <artifactId>maclearner-app</artifactId>
-                            <version>${maclearner.version}</version>
-                            <type>oar</type>
-                            <overWrite>true</overWrite>
-                        </artifactItem>
                     </artifactItems>
                 </configuration>
             </plugin>
diff --git a/get-local-oars.sh b/get-local-oars.sh
index 6c0c007..a230fa0 100755
--- a/get-local-oars.sh
+++ b/get-local-oars.sh
@@ -24,4 +24,3 @@
 cp ../kafka-onos/target/*.oar local_imports/oar/
 cp ../igmpproxy/app/target/*.oar local_imports/oar/
 cp ../mcast/app/target/*.oar local_imports/oar/
-cp ../mac-learning/app/target/*.oar local_imports/oar/