diff --git a/images/core/Dockerfile b/images/core/Dockerfile
index 23ccd4b..8962c72 100644
--- a/images/core/Dockerfile
+++ b/images/core/Dockerfile
@@ -11,7 +11,7 @@ RUN yum -y localinstall /tmp/core/*.rpm; \
     yum -y install x11vnc metacity net-tools gdb perl tar git jq; \
     yum -y install https://centos7.iuscommunity.org/ius-release.rpm; \
     yum -y --setopt=tsflags=nodocs install python36u python36u-devel python36u-pip; \
-    yum -y install java-1.8.0-openjdk; \
+    yum -y install java-1.8.0-openjdk iproute; \
     cert-sync /etc/pki/tls/certs/ca-bundle.crt; \
     oscript /usr/share/oscript/lib/opm/src/cmd/opm.os install deployka; \
     chmod +x /usr/bin/deployka; \
diff --git a/images/core/entrypoint.sh b/images/core/entrypoint.sh
index 35179d5..b8c9c7a 100644
--- a/images/core/entrypoint.sh
+++ b/images/core/entrypoint.sh
@@ -18,9 +18,10 @@ then
         echo "Failed to start ragent: $status"
         exit $status
     fi
+    rm -rf /tmp/.X99-lock
     exec /usr/bin/Xvfb :99 -screen 0 1680x1050x24 -shmem &
-    exec metacity --display=:99 &
-    exec /usr/bin/x11vnc &
+    sleep 5 &&
+    exec /usr/bin/x11vnc -display :99 -forever &
     status=$?
     if [ $status -ne 0 ]; then
         echo "Failed to start Xvfb: $status"
@@ -44,8 +45,7 @@ elif [ "$1" = 'cli' ]
 then
     chown -R usr1cv8:grp1cv8 ${CORELOGS}
     exec /usr/bin/Xvfb :99 -screen 0 1680x1050x24 -shmem &
-    exec metacity --display=:99 &
-    exec /usr/bin/x11vnc    
+    exec /usr/bin/x11vnc -display :99 -forever 
 elif [ "$1" = 'web' ]
 then
     chown -R usr1cv8:grp1cv8 ${CORELOGS}